diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-03 21:11:59 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-03 21:11:59 +0300 |
| commit | b9b477a3f1e64590e087cfe2cc21c9d5bd448756 (patch) | |
| tree | b42659fe7d1f05c4965994929a91b386ff827ff0 /app/models/merge_request.rb | |
| parent | 849c67f6da8d997d9fa54bba3526c64c7678aae6 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 3d789035b9a..a4d9bed70df 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -2002,6 +2002,10 @@ class MergeRequest < ApplicationRecord target_branch == project.default_branch end + def merge_blocked_by_other_mrs? + false # Overridden in EE + end + private attr_accessor :skip_fetch_ref |