diff options
Diffstat (limited to 'app/models/discussion.rb')
| -rw-r--r-- | app/models/discussion.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/models/discussion.rb b/app/models/discussion.rb index 64116d225ae..cc586933112 100644 --- a/app/models/discussion.rb +++ b/app/models/discussion.rb @@ -63,6 +63,14 @@ class Discussion notes.any?(&:to_be_resolved?) end + def can_resolve?(current_user) + return false unless current_user + return false unless resolvable? + + current_user == self.noteable.author || + can?(current_user, :push_code, self.project) + end + def resolve!(current_user) notes.each do |note| note.resolve!(current_user) if note.resolvable? |