diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-23 14:13:27 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-23 14:13:27 +0000 |
| commit | 8fcdfeaee23b87a1d7d8357e693ce7d9df97ab6a (patch) | |
| tree | d3a48a79d3d60ef00a67fa0e141afab438b1fc19 /app/models | |
| parent | 4646d453b3211e29ec5afba2568766018caf32e0 (diff) | |
| parent | f2a0c6f6bf768db8837283ad65fe6790b9105d26 (diff) | |
| download | gitlab-ce-8fcdfeaee23b87a1d7d8357e693ce7d9df97ab6a.tar.gz | |
Merge branch '24863-mrs-without-discussions-are-mergeable' into 'master'
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24863
See merge request !7698
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/merge_request.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 6c3c093d084..fdf54cc8a7e 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -494,10 +494,14 @@ class MergeRequest < ActiveRecord::Base discussions_resolvable? && diff_discussions.none?(&:to_be_resolved?) end + def discussions_to_be_resolved? + discussions_resolvable? && !discussions_resolved? + end + def mergeable_discussions_state? return true unless project.only_allow_merge_if_all_discussions_are_resolved? - discussions_resolved? + !discussions_to_be_resolved? end def hook_attrs |