mirrors
/
glitch-social
mirror of https://github.com/glitch-soc/mastodon
1
0
Fork 0
Code Releases Activity

Fix ruby 2.7 warnings about keyword parameters (#12824)

This commit is contained in:
ThibG 2020-01-11 21:38:02 +01:00 committed by Eugen Rochko
parent 57e2833f6a
commit 10f1450bba
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/routing_helper.rb
View File

@ -13,13 +13,13 @@ module RoutingHelper
end
def full_asset_url(source, **options)
source = ActionController::Base.helpers.asset_url(source, options) unless use_storage?
source = ActionController::Base.helpers.asset_url(source, **options) unless use_storage?
URI.join(root_url, source).to_s
end
def full_pack_url(source, **options)
full_asset_url(asset_pack_path(source, options))
full_asset_url(asset_pack_path(source, **options))
end
private

2
lib/paperclip/blurhash_transcoder.rb
View File

@ -8,7 +8,7 @@ module Paperclip
pixels = convert(':source RGB:-', source: File.expand_path(@file.path)).unpack('C*')
geometry = options.fetch(:file_geometry_parser).from_file(@file)
attachment.instance.blurhash = Blurhash.encode(geometry.width, geometry.height, pixels, options[:blurhash] || {})
attachment.instance.blurhash = Blurhash.encode(geometry.width, geometry.height, pixels, **(options[:blurhash] || {}))
@file
end