summaryrefslogtreecommitdiff
path: root/app/controllers/projects/commit_controller.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-04-16 00:09:09 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-04-16 00:09:09 +0000
commit72179bac11e9c18ea623e30594d6d427ef63db36 (patch)
tree601bc4fbb0a6c30ac866f11f278d80f920440c11 /app/controllers/projects/commit_controller.rb
parent9922389a501dfde79037426fa6d09144ee5f7e1a (diff)
downloadgitlab-ce-72179bac11e9c18ea623e30594d6d427ef63db36.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/commit_controller.rb')
-rw-r--r--app/controllers/projects/commit_controller.rb6
1 files changed, 0 insertions, 6 deletions
diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb
index 3853797e0bf..0c3ff07bc76 100644
--- a/app/controllers/projects/commit_controller.rb
+++ b/app/controllers/projects/commit_controller.rb
@@ -54,8 +54,6 @@ class Projects::CommitController < Projects::ApplicationController
# rubocop: disable CodeReuse/ActiveRecord
def pipelines
- set_pipeline_feature_flag
-
@pipelines = @commit.pipelines.order(id: :desc)
@pipelines = @pipelines.where(ref: params[:ref]).page(params[:page]).per(30) if params[:ref]
@@ -135,10 +133,6 @@ class Projects::CommitController < Projects::ApplicationController
private
- def set_pipeline_feature_flag
- push_frontend_feature_flag(:new_pipelines_table, @project, default_enabled: :yaml)
- end
-
def create_new_branch?
params[:create_merge_request].present? || !can?(current_user, :push_code, @project)
end