diff options
| author | Bob Van Landuyt <bob@gitlab.com> | 2018-10-04 19:52:35 +0300 |
|---|---|---|
| committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-10-04 19:58:05 +0300 |
| commit | 74532158e0599e918e911d1039a92972a7902911 (patch) | |
| tree | b498433ab6b357fd859ee7151e5eaee687017d4c /app | |
| parent | af2e5ea53177a0ced353259f7fa8d47d7390f826 (diff) | |
Merge branch 'security-osw-user-info-leak-discussions-11-3' into 'security-11-3'
[11.3] Filter user sensitive data from discussions JSON
See merge request gitlab/gitlabhq!2537
Diffstat (limited to 'app')
| -rw-r--r-- | app/serializers/discussion_entity.rb | 2 |
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) |