From 4a13aa9f34ab4114bc485e1ca8fa0db8daa0394b Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Wed, 17 Aug 2016 12:14:44 -0500
Subject: Store discussion_id on Note for faster discussion lookup.

---
 app/models/discussion.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/models/discussion.rb')

diff --git a/app/models/discussion.rb b/app/models/discussion.rb
index b26d2282b00..3fddc084af2 100644
--- a/app/models/discussion.rb
+++ b/app/models/discussion.rb
@@ -57,7 +57,7 @@ class Discussion
   def id
     first_note.discussion_id
   end
-  
+
   alias_method :to_param, :id
 
   def diff_discussion?
@@ -93,7 +93,7 @@ class Discussion
     return false unless resolvable?
 
     current_user == self.noteable.author ||
-      current_user.can?(:push_code, self.project)
+      current_user.can?(:resolve_note, self.project)
   end
 
   def resolve!(current_user)
-- 
cgit v1.2.1