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:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-11-17 18:15:43 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-11-17 18:15:43 +0300
commit843b1e9386fbda332839d23246d0ee2382fb7f4c (patch)
tree7663f7e38aa4e018c7210a9abdfddcd83a8bcbce /app/controllers
parent2724004cd7b8fa9d179c926c62f2fd7be63c2d81 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/application_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 6739fc57a1f..f4d9d616851 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -116,7 +116,7 @@ class ApplicationController < ActionController::Base
content_security_policy do |p|
next if p.directives.blank?
- if Rails.env.development? && Feature.enabled?(:vite)
+ if helpers.vite_enabled?
vite_host = ViteRuby.instance.config.host
vite_port = ViteRuby.instance.config.port
vite_origin = "#{vite_host}:#{vite_port}"