diff options
author | ThibG <thib@sitedethib.com> | 2020-01-13 16:07:40 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-13 16:07:40 +0100 |
commit | ddcf78d8d3e2a8cb9aa04f8ff42f9d8e185b0354 (patch) | |
tree | 14bcdbeac5f8d904cad3d13a469869c5baf9db99 /app/helpers | |
parent | 180f1383943ad171d8394ef9af7c7861bfc08056 (diff) | |
parent | 83f8bf48d91605fa63325b4d4acec717031da025 (diff) |
Merge pull request #1263 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/accounts_helper.rb | 2 | ||||
-rw-r--r-- | app/helpers/routing_helper.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/accounts_helper.rb b/app/helpers/accounts_helper.rb index 986fd1805..c9e95d8d8 100644 --- a/app/helpers/accounts_helper.rb +++ b/app/helpers/accounts_helper.rb @@ -3,7 +3,7 @@ module AccountsHelper def display_name(account, **options) if options[:custom_emojify] - Formatter.instance.format_display_name(account, options) + Formatter.instance.format_display_name(account, **options) else account.display_name.presence || account.username end diff --git a/app/helpers/routing_helper.rb b/app/helpers/routing_helper.rb index 998b7566f..fb24a1b28 100644 --- a/app/helpers/routing_helper.rb +++ b/app/helpers/routing_helper.rb @@ -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 |