diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-04-01 16:17:10 +0000 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-04-01 16:17:10 +0000 |
| commit | d8258470b5c8cf5ec9f77cb1e0f8950a87b5c110 (patch) | |
| tree | 689004c4eece5e63ebd3a2666898fe90fab1df92 /app/models/merge_request.rb | |
| parent | 129dce999fdf7394e14bfb4a8bf858ede65d5801 (diff) | |
| parent | a7d4824ded0c5ae6a155d7bdc87a1ba71eb3df5c (diff) | |
| download | gitlab-ce-d8258470b5c8cf5ec9f77cb1e0f8950a87b5c110.tar.gz | |
Merge branch 'check-mergeability-in-merge-to-ref-service' into 'master'
Check mergeability in merge to ref service
See merge request gitlab-org/gitlab-ce!26757
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index d3951cd72db..f6b83453c2a 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -807,8 +807,7 @@ class MergeRequest < ApplicationRecord end def mergeable_to_ref? - return false if merged? - return false if broken? + 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 |