diff options
author | Marin Jankovski <marin@gitlab.com> | 2015-02-21 21:26:54 +0300 |
---|---|---|
committer | Marin Jankovski <marin@gitlab.com> | 2015-02-21 21:26:54 +0300 |
commit | ec1c71d813f3a9431c697031a1f769b263fb34a8 (patch) | |
tree | e1ed55eb5afde48116d668e391acd711c48968aa | |
parent | ebb560ca8d62a2d4ebdf0b20569337775de4e70e (diff) | |
parent | ccac5c96a02f7d42c1c2dcc6143658c9680f26f4 (diff) |
Merge branch '7-8-rc5' into '7-8-stable'
Changes for 7.8 RC5
See merge request !1566
-rw-r--r-- | config/initializers/static_files.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/config/initializers/static_files.rb b/config/initializers/static_files.rb index bc4fe14bc1a..d9042c652bb 100644 --- a/config/initializers/static_files.rb +++ b/config/initializers/static_files.rb @@ -1,6 +1,6 @@ -begin - app = Rails.application +app = Rails.application +if app.config.serve_static_assets # The `ActionDispatch::Static` middleware intercepts requests for static files # by checking if they exist in the `/public` directory. # We're replacing it with our `Gitlab::Middleware::Static` that does the same, @@ -12,7 +12,4 @@ begin app.paths["public"].first, app.config.static_cache_control ) -rescue - # If ActionDispatch::Static wasn't loaded onto the stack (like in production), - # an exception is raised. end |