diff options
| author | Xavier Noria <fxn@hashref.com> | 2016-09-01 23:41:49 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2016-09-01 23:41:49 +0200 |
| commit | bb1ecdcc677bf6e68e0252505509c089619b5b90 (patch) | |
| tree | 99dd8fd164e1c582216a4b08c3d066049217bb7f /actionpack/lib/action_dispatch/routing/mapper.rb | |
| parent | 8c402ef425771c3dbb4659dd946714e69fdf5ce9 (diff) | |
| download | rails-bb1ecdcc677bf6e68e0252505509c089619b5b90.tar.gz rails-bb1ecdcc677bf6e68e0252505509c089619b5b90.tar.bz2 rails-bb1ecdcc677bf6e68e0252505509c089619b5b90.zip | |
fixes remaining RuboCop issues [Vipul A M, Xavier Noria]
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/mapper.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index 67b9463a6a..4ec1b8ee1f 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -1607,7 +1607,7 @@ module ActionDispatch def root(path, options = {}) if path.is_a?(String) options[:to] = path - elsif path.is_a?(Hash) and options.empty? + elsif path.is_a?(Hash) && options.empty? options = path else raise ArgumentError, "must be called with a path and/or options" |