summaryrefslogtreecommitdiff
path: root/app/models/concerns/resolvable_discussion.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/concerns/resolvable_discussion.rb')
-rw-r--r--app/models/concerns/resolvable_discussion.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/models/concerns/resolvable_discussion.rb b/app/models/concerns/resolvable_discussion.rb
index 3e1e5faee54..60e1dde17b9 100644
--- a/app/models/concerns/resolvable_discussion.rb
+++ b/app/models/concerns/resolvable_discussion.rb
@@ -81,8 +81,7 @@ module ResolvableDiscussion
return false unless current_user
return false unless resolvable?
- current_user == self.noteable.try(:author) ||
- current_user.can?(:resolve_note, self.project)
+ current_user.can?(:resolve_note, self.noteable)
end
def resolve!(current_user)