diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
commit | b76ae638462ab0f673e5915986070518dd3f9ad3 (patch) | |
tree | bdab0533383b52873be0ec0eb4d3c66598ff8b91 /app/helpers/compare_helper.rb | |
parent | 434373eabe7b4be9593d18a585fb763f1e5f1a6f (diff) |
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42
Diffstat (limited to 'app/helpers/compare_helper.rb')
-rw-r--r-- | app/helpers/compare_helper.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/helpers/compare_helper.rb b/app/helpers/compare_helper.rb index b07baf59114..f9d62747308 100644 --- a/app/helpers/compare_helper.rb +++ b/app/helpers/compare_helper.rb @@ -38,10 +38,8 @@ module CompareHelper project_merge_request_path: merge_request.present? ? project_merge_request_path(project, merge_request) : '', create_mr_path: create_mr_button? ? create_mr_path : '' }.tap do |data| - if Feature.enabled?(:compare_repo_dropdown, project, default_enabled: :yaml) - data[:project_to] = { id: project.id, name: project.full_path }.to_json - data[:projects_from] = target_projects(project).map { |project| { id: project.id, name: project.full_path } }.to_json - end + data[:project_to] = { id: project.id, name: project.full_path }.to_json + data[:projects_from] = target_projects(project).map { |project| { id: project.id, name: project.full_path } }.to_json end end end |