From 72179bac11e9c18ea623e30594d6d427ef63db36 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 16 Apr 2021 00:09:09 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/controllers/projects/commit_controller.rb | 6 ------ 1 file changed, 6 deletions(-) (limited to 'app/controllers/projects/commit_controller.rb') 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 -- cgit v1.2.1