diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /app/models/concerns/resolvable_discussion.rb | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'app/models/concerns/resolvable_discussion.rb')
-rw-r--r-- | app/models/concerns/resolvable_discussion.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/models/concerns/resolvable_discussion.rb b/app/models/concerns/resolvable_discussion.rb index 5d78eea7fca..5174ae05d15 100644 --- a/app/models/concerns/resolvable_discussion.rb +++ b/app/models/concerns/resolvable_discussion.rb @@ -23,7 +23,10 @@ module ResolvableDiscussion :last_note ) - delegate :potentially_resolvable?, to: :first_note + delegate :potentially_resolvable?, + :noteable_id, + :noteable_type, + to: :first_note delegate :resolved_at, :resolved_by, @@ -79,7 +82,7 @@ module ResolvableDiscussion return false unless current_user return false unless resolvable? - current_user == self.noteable.author || + current_user == self.noteable.try(:author) || current_user.can?(:resolve_note, self.project) end |