diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-21 15:08:26 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-21 15:08:26 +0000 |
| commit | c859c3bfd242288065fe5e2d887f7204f09e2335 (patch) | |
| tree | 10febaf8774a3ea6ab3773c0dd97658d673fb280 /app/controllers/projects/merge_requests_controller.rb | |
| parent | 28ce39a3e0e7b47e53939a15fb823af9c433327a (diff) | |
| download | gitlab-ce-c859c3bfd242288065fe5e2d887f7204f09e2335.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/merge_requests_controller.rb')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 17025670488..22de8dd4109 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -45,7 +45,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo def show close_merge_request_if_no_source_project - @merge_request.check_mergeability + @merge_request.check_mergeability(async: true) respond_to do |format| format.html do |