diff options
| author | Phil Hughes <me@iamphill.com> | 2016-04-22 13:30:58 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-04-22 13:30:58 +0100 |
| commit | 32be8bd2b105885d88e1ad8d5bf1296f974031ab (patch) | |
| tree | 91f8394f732ea3127557df415c7ac4d1fd0245a2 /app | |
| parent | d5398e9656c1174d4d5be5a8cdad2a26d7587a27 (diff) | |
| download | gitlab-ce-32be8bd2b105885d88e1ad8d5bf1296f974031ab.tar.gz | |
Fixed issue with assignee object not being returned
Closes #15515
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/projects/issues_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index 18e28fc49fe..7d4fc361ce2 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -109,7 +109,7 @@ class Projects::IssuesController < Projects::ApplicationController end end format.json do - render json: @issue.to_json(include: [:milestone, labels: { methods: :text_color }, assignee: { methods: :avatar_url }]) + render json: @issue.to_json(include: { milestone: {}, assignee: { methods: :avatar_url }, labels: { methods: :text_color } }) end end end diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index a57fd2d4e34..9c147b3689e 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: { methods: :text_color }, assignee: { methods: :avatar_url }]) + render json: @merge_request.to_json(include: { milestone: {}, assignee: { methods: :avatar_url }, labels: { methods: :text_color } }) end end else |