summaryrefslogtreecommitdiff
path: root/app/models/discussion.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2016-07-26 16:48:33 -0600
committerDouwe Maan <douwe@selenight.nl>2016-07-26 16:48:33 -0600
commitc6d96fdfbcc26f52ad60ae746c4110dd5485ad08 (patch)
treebe4a3f87bf13060628fc046dba62e25c7edaf99f /app/models/discussion.rb
parent5ec7a40bcb774aa93c08bffab995f9561fe101aa (diff)
downloadgitlab-ce-c6d96fdfbcc26f52ad60ae746c4110dd5485ad08.tar.gz
Fix Discussion#resolved? to be false for commit discussions
Diffstat (limited to 'app/models/discussion.rb')
-rw-r--r--app/models/discussion.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/discussion.rb b/app/models/discussion.rb
index 9a13c1aad6c..d17a2dc725d 100644
--- a/app/models/discussion.rb
+++ b/app/models/discussion.rb
@@ -64,7 +64,7 @@ class Discussion
end
def resolved?
- notes.none?(&:to_be_resolved?)
+ resolvable? && notes.none?(&:to_be_resolved?)
end
def to_be_resolved?