aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2015-03-05 13:11:53 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2015-03-05 13:12:06 -0800
commit798a14a6388ac525109e550d72bba0b1118e5e2e (patch)
treecad588c08fd1a4aa2e7a67c3899d131146f14e05 /railties/lib/rails
parentad23aab7b30612d77bf746e6c0ae7a7140de0144 (diff)
downloadrails-798a14a6388ac525109e550d72bba0b1118e5e2e.tar.gz
rails-798a14a6388ac525109e550d72bba0b1118e5e2e.tar.bz2
rails-798a14a6388ac525109e550d72bba0b1118e5e2e.zip
pass a config to the route set
This way we can get the relative_url_root from the application without setting another global value
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/engine.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index fd37fd0457..83cee28fa3 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -528,7 +528,7 @@ module Rails
# Defines the routes for this engine. If a block is given to
# routes, it is appended to the engine.
def routes
- @routes ||= ActionDispatch::Routing::RouteSet.new
+ @routes ||= ActionDispatch::Routing::RouteSet.new_with_config(config)
@routes.append(&Proc.new) if block_given?
@routes
end