diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-10-28 17:55:18 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-10-28 17:55:18 +0000 |
| commit | f4fed44f6700aed93015dfeac0ade00a93e8288d (patch) | |
| tree | aee92baf368c306e9423acb8e486ce5a30e0594b /app/controllers/projects/merge_requests_controller.rb | |
| parent | f60e6d552c47e3119c57ac77838d0666da38c571 (diff) | |
| parent | 32913b74b836c7b689e681a030de00da0552954a (diff) | |
| download | gitlab-ce-f4fed44f6700aed93015dfeac0ade00a93e8288d.tar.gz | |
Merge branch '22392-add-x-of-y-tasks-completed-on-issuable' into 'master'
add "x of y tasks completed" on issuable
Closes #22392
See merge request !6527
Diffstat (limited to 'app/controllers/projects/merge_requests_controller.rb')
| -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 2ee53f7ceda..30f1cf4e5be 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -278,7 +278,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController @merge_request.target_project, @merge_request]) end format.json do - render json: @merge_request.to_json(include: { milestone: {}, assignee: { methods: :avatar_url }, labels: { methods: :text_color } }) + render json: @merge_request.to_json(include: { milestone: {}, assignee: { methods: :avatar_url }, labels: { methods: :text_color } }, methods: [:task_status, :task_status_short]) end end else |