Skip to content

Commit

Permalink
remove another value from IGNORE_OPTIONS
Browse files Browse the repository at this point in the history
  • Loading branch information
tenderlove committed Jun 3, 2014
1 parent a04767d commit 5491710
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions actionpack/lib/action_dispatch/routing/mapper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def constraint_args(constraint, request)
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
Expand All @@ -71,7 +71,7 @@ def initialize(scope, path, options)
@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]

Expand Down

0 comments on commit 5491710

Please sign in to comment.