diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-06-18 11:29:41 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-06-18 11:29:41 +0300 |
| commit | 4be23eeae376ede50905b741f88b089b1669b07f (patch) | |
| tree | 9e1a4cbb1f43651728036247cdc6f6980add0c9a /app/controllers | |
| parent | 39208ed6750e31d10e4bad5a33693a83eb599f1f (diff) | |
| parent | c6420ce2ab18681d6a5b06621d89775e3cf81065 (diff) | |
Merge branch '47933-MR-invisible-milestone' into 'master'
Resolve "Milestone not updating in MR sidebar after selection"
Closes #47933
See merge request gitlab-org/gitlab-ce!19870
Diffstat (limited to 'app/controllers')
| -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 b452bfd7e6f..38918b3cd52 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -115,7 +115,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo end format.json do - render json: @merge_request.to_json(include: { milestone: {}, assignee: { only: [:name, :username], methods: [:avatar_url] }, labels: { methods: :text_color } }, methods: [:task_status, :task_status_short]) + render json: serializer.represent(@merge_request, serializer: 'basic') end end rescue ActiveRecord::StaleObjectError |