diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-12 18:35:06 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-12 18:35:06 +0300 |
| commit | 012cbda407a30ab14e57ece581d720b22b47fe5a (patch) | |
| tree | 62a559d2a0843d2d9700af1bb01a15cbfcee2190 /app/services | |
| parent | 92acfb1b8a9019b3fa3c817d251b2624d55da26d (diff) | |
Add latest changes from gitlab-org/gitlab@14-3-stable-ee
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/merge_requests/mergeability_check_service.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/services/merge_requests/mergeability_check_service.rb b/app/services/merge_requests/mergeability_check_service.rb index c3498c5ce97..3e294aeaa07 100644 --- a/app/services/merge_requests/mergeability_check_service.rb +++ b/app/services/merge_requests/mergeability_check_service.rb @@ -157,9 +157,7 @@ module MergeRequests 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, true) + result = MergeRequests::MergeToRefService.new(project: project, current_user: merge_request.author, params: params).execute(merge_request) result[:status] == :success end |