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

Changes for 7.8 RC5

See merge request !1566

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