Fix Discussion#resolved? to be false for commit discussions

c6d96fdf · Douwe Maan · 5ec7a40b · c6d96fdf
Commit c6d96fdf authored Jul 26, 2016 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

app/models/discussion.rb app/models/discussion.rb +1 -1

No files found.
--- 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?