diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2018-11-20 15:57:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-20 15:57:53 -0500 |
| commit | eb22adce9a3a0d8d02c27d7afc944857e9ca0ada (patch) | |
| tree | 449385b6004d6c3d91f41b2e0eb8e990fc97ee0f /actionpack/lib | |
| parent | 023a840f5f10c5a611a0618ff8ea9e16cd771f93 (diff) | |
| parent | dde9c488398293fb1cbdc02595b8c4e9860b03cc (diff) | |
| download | rails-eb22adce9a3a0d8d02c27d7afc944857e9ca0ada.tar.gz rails-eb22adce9a3a0d8d02c27d7afc944857e9ca0ada.tar.bz2 rails-eb22adce9a3a0d8d02c27d7afc944857e9ca0ada.zip | |
Merge pull request #34494 from gmcgibbon/warn_root_conflict
Stop using unnamed roots on conflict
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index 06ce165f76..421e2023c2 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -656,7 +656,7 @@ module ActionDispatch # Query if the following named route was already defined. def has_named_route?(name) - @set.named_routes.key? name + @set.named_routes.key?(name) end private @@ -1952,9 +1952,7 @@ module ActionDispatch end def match_root_route(options) - name = has_named_route?(name_for_action(:root, nil)) ? nil : :root - args = ["/", { as: name, via: :get }.merge!(options)] - + args = ["/", { as: :root, via: :get }.merge(options)] match(*args) end end |