From c6d96fdfbcc26f52ad60ae746c4110dd5485ad08 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Tue, 26 Jul 2016 16:48:33 -0600
Subject: [PATCH] Fix Discussion#resolved? to be false for commit discussions

---
 app/models/discussion.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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?