diff options
| author | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2021-10-28 12:15:22 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2021-10-28 12:15:22 +0000 |
| commit | 11657a33e97a26f699638ab26ef934c8298126b7 (patch) | |
| tree | bb99c5ce913bce83b0201023468b950911935246 /app/models/concerns/resolvable_discussion.rb | |
| parent | 2bbed5eb0d53a506313d8f95028375586b17d40c (diff) | |
| parent | 893b5cb69e4ce384f1e208906a9d3db387a9c72b (diff) | |
| download | gitlab-ce-11657a33e97a26f699638ab26ef934c8298126b7.tar.gz | |
Merge remote-tracking branch 'dev/14-3-stable' into 14-3-stable
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) |