diff options
| author | Douwe Maan <douwe@gitlab.com> | 2019-06-03 16:29:41 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2019-06-03 16:29:41 +0000 |
| commit | 96ff9c6bd82a6eb60b9f2d1c20fca0105ed4160d (patch) | |
| tree | 7e6025b6d502befb5bc973a42ae02519f5c523aa /app/controllers | |
| parent | a9589cdf28bc789e0b4902e3d45acfc9a6b69217 (diff) | |
| parent | 4246a62118d919e62b94d75eba641ed374c3f241 (diff) | |
| download | gitlab-ce-96ff9c6bd82a6eb60b9f2d1c20fca0105ed4160d.tar.gz | |
Merge branch 'osw-sync-merge-ref-upon-mergeability-check' into 'master'
Automatically update MR merge-ref along merge status
Closes #58495
See merge request gitlab-org/gitlab-ce!28513
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index a3ceb76845e..135117926be 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -33,7 +33,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo def show close_merge_request_if_no_source_project - mark_merge_request_mergeable + @merge_request.check_mergeability respond_to do |format| format.html do @@ -251,10 +251,6 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo @merge_request.has_no_commits? && !@merge_request.target_branch_exists? end - def mark_merge_request_mergeable - @merge_request.check_if_can_be_merged - end - def merge! # Disable the CI check if auto_merge_strategy is specified since we have # to wait until CI completes to know |