summaryrefslogtreecommitdiff
path: root/app/controllers/projects/ci
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-03-01 21:11:09 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-03-01 21:11:09 +0000
commit11b7785066d3e81916cbf653f4eb6568148f7e01 (patch)
treed4e66091e1cbef57db10d2c9c16cd98106e9a633 /app/controllers/projects/ci
parent69f0d90aad454a2b8f3c4e2f2ca31886a14a8642 (diff)
downloadgitlab-ce-11b7785066d3e81916cbf653f4eb6568148f7e01.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/ci')
-rw-r--r--app/controllers/projects/ci/pipeline_editor_controller.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/app/controllers/projects/ci/pipeline_editor_controller.rb b/app/controllers/projects/ci/pipeline_editor_controller.rb
index 79e4ec375b7..4514bf288c5 100644
--- a/app/controllers/projects/ci/pipeline_editor_controller.rb
+++ b/app/controllers/projects/ci/pipeline_editor_controller.rb
@@ -11,7 +11,6 @@ class Projects::Ci::PipelineEditorController < Projects::ApplicationController
feature_category :pipeline_authoring
def show
- render_404 unless ::Gitlab::Ci::Features.ci_pipeline_editor_page_enabled?(@project)
end
private