diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-28 21:14:18 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-28 21:14:18 +0300 |
| commit | b267f3a3acf3fe4cf2a9bb254d7abeb3b2823b21 (patch) | |
| tree | a1c30c9a460a1c990311d47aae72d00368e1a1c1 /app/models/concerns/resolvable_discussion.rb | |
| parent | 03cd4f8da4f848c7dfd0c0b88b4c095f69e56bb0 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/concerns/resolvable_discussion.rb')
| -rw-r--r-- | app/models/concerns/resolvable_discussion.rb | 3 |
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) |