From 0da8428f8efb7af188deb3e85ca911efbfb0e59e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=20S=C3=B5mermaa?= <mart.somermaa@cgi.com>
Date: Wed, 9 Apr 2014 18:24:12 +0300
Subject: [PATCH] Expose event and and mergerequest timestamps in API, make
code more DRY.
---
CHANGELOG | 1 +
lib/api/entities.rb | 9 +++++----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index cdd8e9b665f..7a9fc0e4a06 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -15,6 +15,7 @@ v 6.8.0
- Option to disable standard login
- Clean old created archives from repository downloads directory
- Fix download link for huge MR diffs
+ - Expose event and mergerequest timestamps in API
v 6.7.3
- Fix the merge notification email not being sent (Pierre de La Morinerie)
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 9fa8506926c..abe6fceff14 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -117,22 +117,22 @@ module API
class ProjectEntity < Grape::Entity
expose :id, :iid
expose (:project_id) { |entity| entity.project.id }
+ expose :title, :description
+ expose :state, :created_at, :updated_at
end
class Milestone < ProjectEntity
- expose :title, :description, :due_date, :state, :updated_at, :created_at
+ expose :due_date
end
class Issue < ProjectEntity
- expose :title, :description
expose :label_list, as: :labels
expose :milestone, using: Entities::Milestone
expose :assignee, :author, using: Entities::UserBasic
- expose :state, :updated_at, :created_at
end
class MergeRequest < ProjectEntity
- expose :target_branch, :source_branch, :title, :state, :upvotes, :downvotes, :description
+ expose :target_branch, :source_branch, :upvotes, :downvotes
expose :author, :assignee, using: Entities::UserBasic
expose :source_project_id, :target_project_id
end
@@ -158,6 +158,7 @@ module API
expose :title, :project_id, :action_name
expose :target_id, :target_type, :author_id
expose :data, :target_title
+ expose :created_at
end
class Namespace < Grape::Entity
--
GitLab