diff options
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 |