diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-26 15:09:18 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-26 15:09:18 +0000 |
| commit | 2446c39adaea91d1120c9eb0936e93e9314171c1 (patch) | |
| tree | 12139c11f94232b2a02b511998a456535e33faed /app/serializers/note_entity.rb | |
| parent | c0dd450008c1cee260905e54bbed202891158697 (diff) | |
| download | gitlab-ce-2446c39adaea91d1120c9eb0936e93e9314171c1.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/serializers/note_entity.rb')
| -rw-r--r-- | app/serializers/note_entity.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/serializers/note_entity.rb b/app/serializers/note_entity.rb index 9a96778786b..d44958bc0c4 100644 --- a/app/serializers/note_entity.rb +++ b/app/serializers/note_entity.rb @@ -36,7 +36,8 @@ class NoteEntity < API::Entities::Note end expose :can_resolve_discussion do |note| - note.discussion.resolvable? && note.discussion.can_resolve?(current_user) + discussion = options.fetch(:discussion, nil) || note.discussion + discussion.resolvable? && discussion.can_resolve?(current_user) end end |