summaryrefslogtreecommitdiff
path: root/app/controllers/projects/issues_controller.rb
diff options
context:
space:
mode:
authorDJ Mountney <david@twkie.net>2017-03-20 18:55:40 -0700
committerDJ Mountney <david@twkie.net>2017-03-20 18:55:40 -0700
commit4ea85da9fb99bc4d875cc3dc644476f34f0b8bc3 (patch)
tree4da8d0ca1ef292db5eca8e00ae9ce59e55647b82 /app/controllers/projects/issues_controller.rb
parentf5bc48cf5b639644fc4bf8b6d41cc82cf2eeaf84 (diff)
parent7be39a894b27c0c0e4fab52c2f8147f216376538 (diff)
downloadgitlab-ce-4ea85da9fb99bc4d875cc3dc644476f34f0b8bc3.tar.gz
Merge remote-tracking branch 'dev/master'
Diffstat (limited to 'app/controllers/projects/issues_controller.rb')
-rw-r--r--app/controllers/projects/issues_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index 491cd5dc351..cdb5b4173d3 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -148,7 +148,7 @@ class Projects::IssuesController < Projects::ApplicationController
end
format.json do
- render json: @issue.to_json(include: { milestone: {}, assignee: { methods: :avatar_url }, labels: { methods: :text_color } }, methods: [:task_status, :task_status_short])
+ render json: @issue.to_json(include: { milestone: {}, assignee: { only: [:name, :username], methods: [:avatar_url] }, labels: { methods: :text_color } }, methods: [:task_status, :task_status_short])
end
end