Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'config/initializers/static_files.rb')
-rw-r--r--config/initializers/static_files.rb7
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