diff options
author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-08-04 13:59:30 -0300 |
---|---|---|
committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-08-17 12:58:58 -0300 |
commit | a8b2d7f380a2d87557e278011fb91044de103d02 (patch) | |
tree | ad197ea8dcd5a2b3e44bcad284ce067443d9a195 | |
parent | c14ac835756d1d0f4d0f8279759e2b7f75364447 (diff) | |
download | gitlab-ce-a8b2d7f380a2d87557e278011fb91044de103d02.tar.gz |
Return Issue#iid instead of id when listing issues
-rw-r--r-- | app/controllers/projects/board_issues_controller.rb | 2 | ||||
-rw-r--r-- | spec/fixtures/api/schemas/issue.json | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/projects/board_issues_controller.rb b/app/controllers/projects/board_issues_controller.rb index 30bd2559cec..cdaaacfbbd4 100644 --- a/app/controllers/projects/board_issues_controller.rb +++ b/app/controllers/projects/board_issues_controller.rb @@ -7,7 +7,7 @@ class Projects::BoardIssuesController < Projects::ApplicationController issues = Boards::Issues::ListService.new(project, current_user, filter_params).execute issues = issues.page(params[:page]) - render json: issues.as_json(only: [:id, :title, :confidential], include: { labels: { only: [:id, :title, :color] } }) + render json: issues.as_json(only: [:iid, :title, :confidential], include: { labels: { only: [:id, :title, :color] } }) end def update diff --git a/spec/fixtures/api/schemas/issue.json b/spec/fixtures/api/schemas/issue.json index 666e0cdf82c..0a9bf4e0fb7 100644 --- a/spec/fixtures/api/schemas/issue.json +++ b/spec/fixtures/api/schemas/issue.json @@ -1,12 +1,12 @@ { "type": "object", "required" : [ - "id", + "iid", "title", "confidential" ], "properties" : { - "id": { "type": "integer" }, + "iid": { "type": "integer" }, "title": { "type": "string" }, "confidential": { "type": "boolean" }, "labels": { |