diff options
| author | Jacob Schatz <jacobschatz@Jacobs-MacBook-Pro.local> | 2016-03-26 12:15:42 -0400 |
|---|---|---|
| committer | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-03-30 07:26:09 -0400 |
| commit | 750cd5c0e0a7c8d911f44caa9bf6950b0018dee5 (patch) | |
| tree | 0e1fdc1e1a7b6cf62aa5550874afbf2b33c188d7 | |
| parent | cb6192986a40ab35566bfd8d76f8ffd23ef4d0ab (diff) | |
| download | gitlab-ce-750cd5c0e0a7c8d911f44caa9bf6950b0018dee5.tar.gz | |
Add json response for user avatar in merge request
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 6189de09f27..0b0ad984eb4 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -154,7 +154,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController @merge_request.target_project, @merge_request]) end format.json do - render json: @merge_request.to_json(include: [:milestone, :labels, :assignee]) + render json: @merge_request.to_json(include: [:milestone, :labels, assignee: { methods: :avatar_url }]) end end else |