diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-30 11:19:57 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-06-03 11:33:51 -0700 |
| commit | 4bc441c6f87c06426017a914347f0076bc70cbb5 (patch) | |
| tree | b08e9bc314e7cfe1bfa1d04e2063d36b59759517 /actionpack/lib/action_dispatch/routing | |
| parent | fb9f01b6c4f5a82c5bb435aa38526c656ace1b3d (diff) | |
| download | rails-4bc441c6f87c06426017a914347f0076bc70cbb5.tar.gz rails-4bc441c6f87c06426017a914347f0076bc70cbb5.tar.bz2 rails-4bc441c6f87c06426017a914347f0076bc70cbb5.zip | |
:on is removed from options before the Mapping is instantiated, so remove it from IGNORE_OPTIONS
Diffstat (limited to 'actionpack/lib/action_dispatch/routing')
| -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 ccdbbb6a0b..8d52eb0d11 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 = [:on, :constraints, :defaults, :only, :except, :shallow, :shallow_path, :shallow_prefix] + IGNORE_OPTIONS = [:constraints, :defaults, :only, :except, :shallow, :shallow_path, :shallow_prefix] ANCHOR_CHARACTERS_REGEX = %r{\A(\\A|\^)|(\\Z|\\z|\$)\Z} attr_reader :scope, :options, :requirements, :conditions, :defaults |