summaryrefslogtreecommitdiff
path: root/app/controllers/projects/settings/ci_cd_controller.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/controllers/projects/settings/ci_cd_controller.rb')
-rw-r--r--app/controllers/projects/settings/ci_cd_controller.rb11
1 files changed, 5 insertions, 6 deletions
diff --git a/app/controllers/projects/settings/ci_cd_controller.rb b/app/controllers/projects/settings/ci_cd_controller.rb
index cf07de4dc29..f8133c5836d 100644
--- a/app/controllers/projects/settings/ci_cd_controller.rb
+++ b/app/controllers/projects/settings/ci_cd_controller.rb
@@ -4,6 +4,7 @@ module Projects
module Settings
class CiCdController < Projects::ApplicationController
include RunnerSetupScripts
+ include ZuoraCSP
NUMBER_OF_RUNNERS_PER_PAGE = 20
@@ -21,13 +22,11 @@ module Projects
@entity = :project
@variable_limit = ::Plan.default.actual_limits.project_ci_variables
- if Feature.enabled?(:ci_pipeline_triggers_settings_vue_ui, @project)
- triggers = ::Ci::TriggerSerializer.new.represent(
- @project.triggers, current_user: current_user, project: @project
- )
+ triggers = ::Ci::TriggerSerializer.new.represent(
+ @project.triggers, current_user: current_user, project: @project
+ )
- @triggers_json = Gitlab::Json.dump(triggers)
- end
+ @triggers_json = Gitlab::Json.dump(triggers)
render
end