summaryrefslogtreecommitdiff
path: root/app/controllers/projects/settings
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-19 18:09:17 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-19 18:09:17 +0000
commit0eb4fd2f32e6804bc85868ba167170238e346279 (patch)
treec020e787ea29c77e1e9f53c21940f88a87a6e905 /app/controllers/projects/settings
parent78d8830cec030ff12afed3c8ae1dddec454d0a24 (diff)
downloadgitlab-ce-0eb4fd2f32e6804bc85868ba167170238e346279.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/settings')
-rw-r--r--app/controllers/projects/settings/ci_cd_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/settings/ci_cd_controller.rb b/app/controllers/projects/settings/ci_cd_controller.rb
index 43c798bfc6e..aac6ecb07e4 100644
--- a/app/controllers/projects/settings/ci_cd_controller.rb
+++ b/app/controllers/projects/settings/ci_cd_controller.rb
@@ -6,7 +6,7 @@ module Projects
before_action :authorize_admin_pipeline!
before_action :define_variables
before_action do
- push_frontend_feature_flag(:new_variables_ui, @project, default_enabled: true)
+ push_frontend_feature_flag(:new_variables_ui, @project)
end
def show