summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-08-09 06:10:01 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-08-09 06:10:01 +0000
commit4b8939db3d80469826a62f1409b921f96dac2498 (patch)
tree7a3a0a8dab9b45c1c8071a0717267d87d4b01ee8 /app/controllers
parent53f7c2edf478dac9e6b8e52c4b9a59c53659eb31 (diff)
downloadgitlab-ce-4b8939db3d80469826a62f1409b921f96dac2498.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/projects/compare_controller.rb5
1 files changed, 0 insertions, 5 deletions
diff --git a/app/controllers/projects/compare_controller.rb b/app/controllers/projects/compare_controller.rb
index edf45e7063a..99f62c18593 100644
--- a/app/controllers/projects/compare_controller.rb
+++ b/app/controllers/projects/compare_controller.rb
@@ -20,10 +20,6 @@ class Projects::CompareController < Projects::ApplicationController
# Validation
before_action :validate_refs!
- before_action do
- push_frontend_feature_flag(:compare_repo_dropdown, source_project, default_enabled: :yaml)
- end
-
feature_category :source_code_management
# Diffs may be pretty chunky, the less is better in this endpoint.
@@ -91,7 +87,6 @@ class Projects::CompareController < Projects::ApplicationController
def target_project
strong_memoize(:target_project) do
next source_project unless params.key?(:from_project_id)
- next source_project unless Feature.enabled?(:compare_repo_dropdown, source_project, default_enabled: :yaml)
next source_project if params[:from_project_id].to_i == source_project.id
target_project = target_projects(source_project).find_by_id(params[:from_project_id])