diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-12-06 15:40:59 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-12-06 15:40:59 -0600 |
| commit | f1cbea77a4a52929244198dcbde26d63d837489a (patch) | |
| tree | 82645dbc9eec65f870ce7a211355deb6bdc29f29 /app/helpers/routing_helper.rb | |
| parent | 21e28a5caa5e92165322c4127c89a6f88e68198a (diff) | |
| parent | 8ca91cef45417947607079118b1af07c9774ae58 (diff) | |
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
Diffstat (limited to 'app/helpers/routing_helper.rb')
| -rw-r--r-- | app/helpers/routing_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/routing_helper.rb b/app/helpers/routing_helper.rb index f4693358c..11894a895 100644 --- a/app/helpers/routing_helper.rb +++ b/app/helpers/routing_helper.rb @@ -11,7 +11,7 @@ module RoutingHelper end end - def full_asset_url(source, options = {}) + def full_asset_url(source, **options) source = ActionController::Base.helpers.asset_url(source, options) unless use_storage? URI.join(root_url, source).to_s |