diff options
author | Douwe Maan <douwe@gitlab.com> | 2019-06-24 09:31:46 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2019-06-24 09:31:46 +0000 |
commit | 7821defab33f917b62d1132339a521d609f191d6 (patch) | |
tree | 8fb9f71900430de597b7a4b56d0cf1a44f691d87 /app/models | |
parent | 833cb6e9f1506cf920c9bdf61cdb0095899ec778 (diff) | |
parent | 74a3e6b71254409d423077987f6961ea17ba00d9 (diff) | |
download | gitlab-ce-7821defab33f917b62d1132339a521d609f191d6.tar.gz |
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/models')
-rw-r--r-- | app/models/merge_request.rb | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index f07636e8f77..df2dc9c49eb 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -725,19 +725,16 @@ class MergeRequest < ApplicationRecord MergeRequests::ReloadDiffsService.new(self, current_user).execute end - # rubocop: enable CodeReuse/ServiceClass - - def check_if_can_be_merged - return unless self.class.state_machines[:merge_status].check_state?(merge_status) && Gitlab::Database.read_write? - can_be_merged = - !broken? && project.repository.can_be_merged?(diff_head_sha, target_branch) + def check_mergeability + MergeRequests::MergeabilityCheckService.new(self).execute + end + # rubocop: enable CodeReuse/ServiceClass - if can_be_merged - mark_as_mergeable - else - mark_as_unmergeable - end + # Returns boolean indicating the merge_status should be rechecked in order to + # switch to either can_be_merged or cannot_be_merged. + def recheck_merge_status? + self.class.state_machines[:merge_status].check_state?(merge_status) end def merge_event @@ -763,7 +760,7 @@ class MergeRequest < ApplicationRecord def mergeable?(skip_ci_check: false) return false unless mergeable_state?(skip_ci_check: skip_ci_check) - check_if_can_be_merged + check_mergeability can_be_merged? && !should_be_rebased? end @@ -778,15 +775,6 @@ class MergeRequest < ApplicationRecord true end - def mergeable_to_ref? - return false unless mergeable_state?(skip_ci_check: true, skip_discussions_check: true) - - # Given the `merge_ref_path` will have the same - # state the `target_branch` would have. Ideally - # we need to check if it can be merged to it. - project.repository.can_be_merged?(diff_head_sha, target_branch) - end - def ff_merge_possible? project.repository.ancestor?(target_branch_sha, diff_head_sha) end @@ -1099,6 +1087,12 @@ class MergeRequest < ApplicationRecord target_project.repository.fetch_source_branch!(source_project.repository, source_branch, ref_path) end + # Returns the current merge-ref HEAD commit. + # + def merge_ref_head + project.repository.commit(merge_ref_path) + end + def ref_path "refs/#{Repository::REF_MERGE_REQUEST}/#{iid}/head" end |