Commit ec1c71d8 authored by Marin Jankovski's avatar Marin Jankovski

Merge branch '7-8-rc5' into '7-8-stable'

Changes for 7.8 RC5

See merge request !1566
parents ebb560ca ccac5c96
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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment