diff options
Diffstat (limited to 'app/services/merge_requests/mergeability_check_service.rb')
| -rw-r--r-- | app/services/merge_requests/mergeability_check_service.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/services/merge_requests/mergeability_check_service.rb b/app/services/merge_requests/mergeability_check_service.rb index 1ce44f465cd..2a3f417a33b 100644 --- a/app/services/merge_requests/mergeability_check_service.rb +++ b/app/services/merge_requests/mergeability_check_service.rb @@ -156,8 +156,7 @@ module MergeRequests end def merge_to_ref - params = { allow_conflicts: Feature.enabled?(:display_merge_conflicts_in_diff, project) } - result = MergeRequests::MergeToRefService.new(project: project, current_user: merge_request.author, params: params).execute(merge_request) + result = MergeRequests::MergeToRefService.new(project: project, current_user: merge_request.author, params: {}).execute(merge_request) result[:status] == :success end |