diff options
| author | Bob Van Landuyt <bob@gitlab.com> | 2018-10-05 17:45:51 +0000 |
|---|---|---|
| committer | Bob Van Landuyt <bob@gitlab.com> | 2018-10-05 17:45:51 +0000 |
| commit | b82cdf0ec0eb662ffe61ab1b9e9abfb881e0d2a1 (patch) | |
| tree | 9a8eb16f1114605e31ad6df2de58b1f55adbdd2c /app | |
| parent | aa53ae8aac79420bdc52c2d1c006bab097ac1719 (diff) | |
| parent | 96faeb330860d8f6c509947e9f683c337ccdb6f8 (diff) | |
| download | gitlab-ce-b82cdf0ec0eb662ffe61ab1b9e9abfb881e0d2a1.tar.gz | |
Merge branch 'security-osw-user-info-leak-discussions' into 'master'
[security - master] Filter user sensitive data from discussions JSON
See merge request gitlab/gitlabhq!2536
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) |