summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-07-11 16:55:04 +0000
committerRémy Coutable <remy@rymai.me>2016-07-11 16:55:04 +0000
commit78a356a433f2be70ff58450b6b1d2e9b9524a9bd (patch)
tree758472b53bb9abde67f7cf2dda852cd2a71a618d /lib
parent284ed39e3038392e5ca299a8ce58541a4abead99 (diff)
parent552f54b9f3d80fd49a3c381046cc95426b38b6ba (diff)
downloadgitlab-ce-78a356a433f2be70ff58450b6b1d2e9b9524a9bd.tar.gz
Merge branch 'remove-duplicate-api-field' into 'master'
entities: remove :description from MergeRequest ## What does this MR do? Removes a duplicate `description` key from API JSON objects. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? `description` is already exported via `ProjectEntity` and doesn't need to be listed in `MergeRequest` as well. ## What are the relevant issue numbers? N/A ## Screenshots (if relevant) N/A ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5099
Diffstat (limited to 'lib')
-rw-r--r--lib/api/entities.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 9076a0c3831..8edb80177da 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -199,7 +199,6 @@ module API
expose :author, :assignee, using: Entities::UserBasic
expose :source_project_id, :target_project_id
expose :label_names, as: :labels
- expose :description
expose :work_in_progress?, as: :work_in_progress
expose :milestone, using: Entities::Milestone
expose :merge_when_build_succeeds