diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-12-06 20:17:13 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-12-06 20:17:13 +0000 |
| commit | 8ca91cef45417947607079118b1af07c9774ae58 (patch) | |
| tree | cafbe6cc30563ca35ffa522056ead63ca450d9c1 /app/helpers/routing_helper.rb | |
| parent | f2f2f1032082d6212771bd0307136484f671d37e (diff) | |
| parent | a0047fdca052088cce0e23c3b58b95f13be19805 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/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 |