diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-30 10:48:20 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-06-03 11:33:50 -0700 |
| commit | 54917109344a080397ce73023df3b973f251f7e9 (patch) | |
| tree | f0f83bee91207cca0f4d72ce20876a2dc7b7a7aa /actionpack/lib/action_dispatch/routing | |
| parent | a04767d77c342ff398cd7ff710b170ae321e558f (diff) | |
| download | rails-54917109344a080397ce73023df3b973f251f7e9.tar.gz rails-54917109344a080397ce73023df3b973f251f7e9.tar.bz2 rails-54917109344a080397ce73023df3b973f251f7e9.zip | |
remove another value from IGNORE_OPTIONS
Diffstat (limited to 'actionpack/lib/action_dispatch/routing')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index fa3bb863d0..708f0a2b43 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -60,7 +60,7 @@ module ActionDispatch end class Mapping #:nodoc: - IGNORE_OPTIONS = [:to, :as, :via, :on, :constraints, :defaults, :only, :except, :anchor, :shallow, :shallow_path, :shallow_prefix] + IGNORE_OPTIONS = [:as, :via, :on, :constraints, :defaults, :only, :except, :anchor, :shallow, :shallow_path, :shallow_prefix] ANCHOR_CHARACTERS_REGEX = %r{\A(\\A|\^)|(\\Z|\\z|\$)\Z} attr_reader :scope, :options, :requirements, :conditions, :defaults @@ -71,7 +71,7 @@ module ActionDispatch @requirements, @conditions, @defaults = {}, {}, {} options = scope[:options].merge(options) if scope[:options] - @to = options[:to] + @to = options.delete :to @default_controller = options[:controller] || scope[:controller] @default_action = options[:action] || scope[:action] |