aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2014-05-27 13:44:58 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2014-05-27 13:44:58 -0700
commit7fe14432d875fdf52fe95044a38f110582227bd3 (patch)
tree93c57ba62e46881826c5807fb82cd20f65f0a6f5 /actionpack/lib/action_dispatch
parent402c2af55053c2f29319091ad21fd6fa6b90ee89 (diff)
downloadrails-7fe14432d875fdf52fe95044a38f110582227bd3.tar.gz
rails-7fe14432d875fdf52fe95044a38f110582227bd3.tar.bz2
rails-7fe14432d875fdf52fe95044a38f110582227bd3.zip
constraints class does not need the request class anymore
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 0c3581db32..cabaa26e44 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -19,7 +19,7 @@ module ActionDispatch
class Constraints < Endpoint #:nodoc:
attr_reader :app, :constraints
- def initialize(app, constraints, request, dispatcher_p)
+ def initialize(app, constraints, dispatcher_p)
# Unwrap Constraints objects. I don't actually think it's possible
# to pass a Constraints object to this constructor, but there were
# multiple places that kept testing children of this object. I
@@ -31,7 +31,7 @@ module ActionDispatch
@dispatcher = dispatcher_p
- @app, @constraints, @request = app, constraints, request
+ @app, @constraints, = app, constraints
end
def dispatcher?; @dispatcher; end
@@ -226,11 +226,11 @@ module ActionDispatch
if Redirect === to
to
else
- Constraints.new(to, blocks, @set.request_class, false)
+ Constraints.new(to, blocks, false)
end
else
if blocks.any?
- Constraints.new(dispatcher, blocks, @set.request_class, true)
+ Constraints.new(dispatcher, blocks, true)
else
dispatcher
end