summaryrefslogtreecommitdiff
path: root/app/serializers
diff options
context:
space:
mode:
authorOswaldo Ferreira <oswaldo@gitlab.com>2018-10-01 10:53:08 -0300
committerOswaldo Ferreira <oswaldo@gitlab.com>2018-10-01 10:53:08 -0300
commitb18345fac49e3b0ef35a22f3d784aef9f6bf9209 (patch)
treef74c10565f781c04bbe9a62efa0e8fcd1af13982 /app/serializers
parente5d3a75aac4f0bb287699b21f3a56b8bfe499665 (diff)
downloadgitlab-ce-b18345fac49e3b0ef35a22f3d784aef9f6bf9209.tar.gz
Filter user sensitive data from discussions JSON
Diffstat (limited to 'app/serializers')
-rw-r--r--app/serializers/discussion_entity.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/discussion_entity.rb b/app/serializers/discussion_entity.rb
index ebe76c9fcda..b6786a0d597 100644
--- a/app/serializers/discussion_entity.rb
+++ b/app/serializers/discussion_entity.rb
@@ -27,7 +27,7 @@ class DiscussionEntity < Grape::Entity
expose :resolved?, as: :resolved
expose :resolved_by_push?, as: :resolved_by_push
- expose :resolved_by
+ expose :resolved_by, using: NoteUserEntity
expose :resolved_at
expose :resolve_path, if: -> (d, _) { d.resolvable? } do |discussion|
resolve_project_merge_request_discussion_path(discussion.project, discussion.noteable, discussion.id)