diff options
| author | Piotr Sarnacki <drogus@gmail.com> | 2012-04-28 14:27:08 -0700 |
|---|---|---|
| committer | Piotr Sarnacki <drogus@gmail.com> | 2012-04-28 14:38:12 -0700 |
| commit | 5a2fdaa27796502daf0fb2314e599b76049296d4 (patch) | |
| tree | 7d9598ee7eb3a389a70f03e1c249ba7377eb2627 /railties/lib | |
| parent | d9239fd4c9e35f93e6594b1d95af85e772fc2b26 (diff) | |
| download | rails-5a2fdaa27796502daf0fb2314e599b76049296d4.tar.gz rails-5a2fdaa27796502daf0fb2314e599b76049296d4.tar.bz2 rails-5a2fdaa27796502daf0fb2314e599b76049296d4.zip | |
Fix Engine#routes to not call draw_paths multiple times
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/engine.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb index d81f9cf7ff..d4f632702c 100644 --- a/railties/lib/rails/engine.rb +++ b/railties/lib/rails/engine.rb @@ -486,8 +486,10 @@ module Rails end def routes - @routes ||= ActionDispatch::Routing::RouteSet.new - @routes.draw_paths.concat paths["config/routes"].paths + @routes ||= ActionDispatch::Routing::RouteSet.new.tap do |routes| + routes.draw_paths.concat paths["config/routes"].paths + end + @routes.append(&Proc.new) if block_given? @routes end |