diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2016-06-27 18:01:56 -0400 |
|---|---|---|
| committer | Ben Boeckel <ben.boeckel@kitware.com> | 2016-07-11 09:08:19 -0400 |
| commit | 552f54b9f3d80fd49a3c381046cc95426b38b6ba (patch) | |
| tree | de46fd715c7c72e843cd26eaf2011f80d68ec773 | |
| parent | 7303de91ecd6c3a39b5dfa27cd3ac3db613b1e42 (diff) | |
| download | gitlab-ce-552f54b9f3d80fd49a3c381046cc95426b38b6ba.tar.gz | |
entities: remove :description from MergeRequest
It is already part of ProjectEntity.
| -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 |