diff options
| author | Jeremy Daer <jeremydaer@gmail.com> | 2016-04-19 15:01:28 -0700 |
|---|---|---|
| committer | Jeremy Daer <jeremydaer@gmail.com> | 2016-04-19 15:01:28 -0700 |
| commit | ee25e1992c942cc3369b245a2736aff2a3bc5a02 (patch) | |
| tree | c218bafe08bb712d7a5c458808bcbec23dad77bc /actionpack/lib/action_dispatch | |
| parent | 0ff0add0400cdee5869d246315cc2551347187aa (diff) | |
| parent | fea7c9fed65b9dd305562483c1cfd80104d521b5 (diff) | |
| download | rails-ee25e1992c942cc3369b245a2736aff2a3bc5a02.tar.gz rails-ee25e1992c942cc3369b245a2736aff2a3bc5a02.tar.bz2 rails-ee25e1992c942cc3369b245a2736aff2a3bc5a02.zip | |
Merge pull request #24031 from samphilipd/sam/do_not_clobber_options_in_route_definitions
Do not destructively mutate passed options hash in route definitions
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index 5a747b5f17..ffd5b83ad3 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -1,4 +1,3 @@ -require 'active_support/core_ext/hash/reverse_merge' require 'active_support/core_ext/hash/slice' require 'active_support/core_ext/enumerable' require 'active_support/core_ext/array/extract_options' @@ -824,7 +823,7 @@ module ActionDispatch URL_OPTIONS.include?(k) && (v.is_a?(String) || v.is_a?(Fixnum)) end - (options[:defaults] ||= {}).reverse_merge!(defaults) + options[:defaults] = defaults.merge(options[:defaults] || {}) else block, options[:constraints] = options[:constraints], {} end |