diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
| commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
| tree | fb69158581673816a8cd895f9d352dcb3c678b1e /app/helpers/commits_helper.rb | |
| parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) | |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'app/helpers/commits_helper.rb')
| -rw-r--r-- | app/helpers/commits_helper.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb index 9b952ad127e..a7696ba4ea7 100644 --- a/app/helpers/commits_helper.rb +++ b/app/helpers/commits_helper.rb @@ -137,8 +137,6 @@ module CommitsHelper end def cherry_pick_projects_data(project) - return [] unless Feature.enabled?(:pick_into_project, project, default_enabled: :yaml) - [project, project.forked_from_project].compact.map do |project| { id: project.id.to_s, @@ -160,8 +158,8 @@ module CommitsHelper commit.author, ref, { - merge_request: merge_request, - pipeline_status: commit.status_for(ref), + merge_request: merge_request&.cache_key, + pipeline_status: commit.status_for(ref)&.cache_key, xhr: request.xhr?, controller: controller.controller_path, path: @path # referred to in #link_to_browse_code |