diff options
Diffstat (limited to 'lib/api/merge_requests.rb')
| -rw-r--r-- | lib/api/merge_requests.rb | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index ff4ad85115b..773a451d3a8 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -8,7 +8,6 @@ module API before { authenticate_non_get! } - helpers ::Gitlab::IssuableMetadata helpers Helpers::MergeRequestsHelpers # EE::API::MergeRequests would override the following helpers @@ -92,10 +91,8 @@ module API if params[:view] == 'simple' options[:with] = Entities::MergeRequestSimple else - options[:issuable_metadata] = issuable_meta_data(merge_requests, 'MergeRequest', current_user) - if Feature.enabled?(:mr_list_api_skip_merge_status_recheck, default_enabled: true) - options[:skip_merge_status_recheck] = !declared_params[:with_merge_status_recheck] - end + options[:issuable_metadata] = Gitlab::IssuableMetadata.new(current_user, merge_requests).data + options[:skip_merge_status_recheck] = !declared_params[:with_merge_status_recheck] end options @@ -478,7 +475,7 @@ module API squash_commit_message: params[:squash_commit_message], should_remove_source_branch: params[:should_remove_source_branch], sha: params[:sha] || merge_request.diff_head_sha - ) + ).compact if immediately_mergeable ::MergeRequests::MergeService |