diff options
author | Winnie Hellmann <winnie@gitlab.com> | 2018-05-10 17:54:41 +0200 |
---|---|---|
committer | Winnie Hellmann <winnie@gitlab.com> | 2018-05-10 17:54:41 +0200 |
commit | 1c33f84dd14a259c193655c30e6b7fedb0b01df8 (patch) | |
tree | 121f648337670afa04b3b5bf824f0a0fb15e2d1e /app/serializers/discussion_entity.rb | |
parent | 0eefbdb19e056bcaf38d981885b8b95624d5e178 (diff) | |
download | gitlab-ce-1c33f84dd14a259c193655c30e6b7fedb0b01df8.tar.gz |
Add "resolved by" to discussions
Diffstat (limited to 'app/serializers/discussion_entity.rb')
-rw-r--r-- | app/serializers/discussion_entity.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/serializers/discussion_entity.rb b/app/serializers/discussion_entity.rb index 4e1819aa3fc..cd919ca511d 100644 --- a/app/serializers/discussion_entity.rb +++ b/app/serializers/discussion_entity.rb @@ -25,6 +25,7 @@ class DiscussionEntity < Grape::Entity expose :resolve_with_issue_path, if: -> (d, _) { d.resolvable? } do |discussion| new_project_issue_path(discussion.project, merge_request_to_resolve_discussions_of: discussion.noteable.iid, discussion_to_resolve: discussion.id) end + expose :resolved_by_push?, as: :resolved_by_push expose :diff_file, using: DiffFileEntity, if: -> (discussion, _) { discussion.respond_to?(:diff_file) } |