diff options
| author | Guilherme Salazar <gmesalazar@gmail.com> | 2016-09-26 18:36:11 -0300 |
|---|---|---|
| committer | Guilherme Salazar <gmesalazar@gmail.com> | 2016-10-28 14:01:36 -0200 |
| commit | 32913b74b836c7b689e681a030de00da0552954a (patch) | |
| tree | 3e13e52f35e8236049c8413e695a47bae8f3a671 /app/controllers | |
| parent | 4fd015183cdb280083384c69261c2ab5d475a54b (diff) | |
| download | gitlab-ce-32913b74b836c7b689e681a030de00da0552954a.tar.gz | |
add "x of y tasks completed" on issuable
fix issues pointed out in !6527
add task completion status feature to CHANGELOG
Diffstat (limited to 'app/controllers')
| -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 cb649264146..3f1a1d1c511 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -112,7 +112,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 } }) + render json: @issue.to_json(include: { milestone: {}, assignee: { methods: :avatar_url }, labels: { methods: :text_color } }, methods: [:task_status, :task_status_short]) end end 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 |