diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-07-11 16:55:04 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-07-11 16:55:04 +0000 |
| commit | 78a356a433f2be70ff58450b6b1d2e9b9524a9bd (patch) | |
| tree | 758472b53bb9abde67f7cf2dda852cd2a71a618d | |
| parent | 284ed39e3038392e5ca299a8ce58541a4abead99 (diff) | |
| parent | 552f54b9f3d80fd49a3c381046cc95426b38b6ba (diff) | |
| download | gitlab-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
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | lib/api/entities.rb | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index a977fc3fdbf..b905203bcc4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -63,6 +63,7 @@ v 8.10.0 (unreleased) - Added setting to set new users by default as external !4545 (Dravere) - Add min value for project limit field on user's form !3622 (jastkand) - Add reminder to not paste private SSH keys !4399 (Ingo Blechschmidt) + - Remove duplicate `description` field in `MergeRequest` entities (Ben Boeckel) v 8.9.5 - Add more debug info to import/export and memory killer. !5108 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 |