From 552f54b9f3d80fd49a3c381046cc95426b38b6ba Mon Sep 17 00:00:00 2001
From: Ben Boeckel <ben.boeckel@kitware.com>
Date: Mon, 27 Jun 2016 18:01:56 -0400
Subject: [PATCH] entities: remove :description from MergeRequest
It is already part of ProjectEntity.
---
CHANGELOG | 1 +
lib/api/entities.rb | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/CHANGELOG b/CHANGELOG
index a977fc3fdbfa5..b905203bcc478 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 9076a0c3831b0..8edb80177daa3 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -199,7 +199,6 @@ class MergeRequest < ProjectEntity
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
--
GitLab