diff options
author | utilum <oz@utilum.com> | 2018-04-17 21:58:44 +0200 |
---|---|---|
committer | utilum <oz@utilum.com> | 2018-04-17 22:07:26 +0200 |
commit | 8201646327796b18187b9ca3a165a18a468cc2f6 (patch) | |
tree | 0883b33df365e158f81a5bc2c781a016058440c4 /actionview | |
parent | 74525b26d2e2eee897707546b7d63e4fa6bdc0f1 (diff) | |
download | rails-8201646327796b18187b9ca3a165a18a468cc2f6.tar.gz rails-8201646327796b18187b9ca3a165a18a468cc2f6.tar.bz2 rails-8201646327796b18187b9ca3a165a18a468cc2f6.zip |
Ruby 2.6 warning: passing splat keyword arguments as a single Hash
Before:
```
$ ruby -v
ruby 2.6.0dev (2018-04-04 trunk 63085) [x86_64-linux]
$ bundle exec rake test:template
...
/rails/actionview/lib/action_view/digestor.rb:76: warning: passing splat keyword arguments as a single Hash to `find_all'
```
Diffstat (limited to 'actionview')
-rw-r--r-- | actionview/lib/action_view/digestor.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/actionview/lib/action_view/digestor.rb b/actionview/lib/action_view/digestor.rb index 45cf48b3e0..3832293251 100644 --- a/actionview/lib/action_view/digestor.rb +++ b/actionview/lib/action_view/digestor.rb @@ -71,11 +71,16 @@ module ActionView private def find_template(finder, *args) + name = args.first + prefixes = args[1] || [] + partial = args[2] || false + keys = args[3] || [] + options = args[4] || {} finder.disable_cache do if format = finder.rendered_format - finder.find_all(*args, formats: [format]).first || finder.find_all(*args).first + finder.find_all(name, prefixes, partial, keys, options.merge(formats: [format])).first || finder.find_all(name, prefixes, partial, keys, options).first else - finder.find_all(*args).first + finder.find_all(name, prefixes, partial, keys, options).first end end end |