diff options
| author | Douwe Maan <douwe@gitlab.com> | 2019-06-24 12:31:46 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2019-06-24 12:31:46 +0300 |
| commit | 7821defab33f917b62d1132339a521d609f191d6 (patch) | |
| tree | 8fb9f71900430de597b7a4b56d0cf1a44f691d87 /app/controllers | |
| parent | 833cb6e9f1506cf920c9bdf61cdb0095899ec778 (diff) | |
| parent | 74a3e6b71254409d423077987f6961ea17ba00d9 (diff) | |
Merge branch 'sync-merge-ref-upon-mergeability-check' into 'master'
Automatically update MR merge-ref along merge status
See merge request gitlab-org/gitlab-ce!29569
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 2695f8a3192..fc37ce1dbc4 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 |