diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-10-07 11:01:21 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-10-07 11:01:21 +0000 |
| commit | 546b18b90317c0c9c0163ddcc5c54798a0bed841 (patch) | |
| tree | ff10c1965e629113b25be892a72c0f181f1b8671 /app/models/merge_request.rb | |
| parent | 3cb798357fbfb8b3230b60130fc1c6b328ae84b7 (diff) | |
| parent | d13669716ab0c31ce9039ae9f7f073e33a4dc40f (diff) | |
| download | gitlab-ce-546b18b90317c0c9c0163ddcc5c54798a0bed841.tar.gz | |
Merge branch 'tc-geo-read-only-idea' into 'master'
Create idea of read-only database
Closes #37534
See merge request gitlab-org/gitlab-ce!14688
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 9b312f7db6c..292122f779e 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -477,7 +477,7 @@ class MergeRequest < ActiveRecord::Base end def check_if_can_be_merged - return unless unchecked? + return unless unchecked? && Gitlab::Database.read_write? can_be_merged = !broken? && project.repository.can_be_merged?(diff_head_sha, target_branch) |