aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2015-09-29 13:35:13 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2015-09-29 13:35:13 -0700
commit42070f892b1b625f89c3d9fe804cf1b43b25633e (patch)
tree4bb1a38d535df96b7c8cbef4940564b774781bf5 /railties/lib/rails/application.rb
parentbb25c671c8c201e3dccdb1aa001abbabb4597b35 (diff)
downloadrails-42070f892b1b625f89c3d9fe804cf1b43b25633e.tar.gz
rails-42070f892b1b625f89c3d9fe804cf1b43b25633e.tar.bz2
rails-42070f892b1b625f89c3d9fe804cf1b43b25633e.zip
Engines get different middleware than apps
We shouldn't merge the app middleware in to the config middleware for engines.
Diffstat (limited to 'railties/lib/rails/application.rb')
-rw-r--r--railties/lib/rails/application.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 8075068b3f..e3716992f5 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -514,5 +514,11 @@ module Rails
end
end
end
+
+ private
+
+ def build_middleware
+ config.app_middleware + super
+ end
end
end