diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-12 15:06:26 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-12 15:06:26 +0000 |
| commit | 69944ffb68788d190e81ff7e33db5dcb6c903184 (patch) | |
| tree | 4112a1285f186c140749e8410a8a2788b6812500 /app/models/merge_request.rb | |
| parent | 1b7381e998ff4b33ec8f633766030082e95f10c8 (diff) | |
| download | gitlab-ce-69944ffb68788d190e81ff7e33db5dcb6c903184.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 5e3cef0a52f..b85285978ab 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -796,6 +796,8 @@ class MergeRequest < ApplicationRecord end def check_mergeability + return if Feature.enabled?(:merge_requests_conditional_mergeability_check, default_enabled: true) && !recheck_merge_status? + MergeRequests::MergeabilityCheckService.new(self).execute(retry_lease: false) end # rubocop: enable CodeReuse/ServiceClass |