Commit 156465ce authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #6747 from mrts/expose-event-and-mergerequest-timestamps-in-api

Expose event and mergerequest timestamps in API
parents 6d57acce 0da8428f
...@@ -15,6 +15,7 @@ v 6.8.0 ...@@ -15,6 +15,7 @@ v 6.8.0
- Option to disable standard login - Option to disable standard login
- Clean old created archives from repository downloads directory - Clean old created archives from repository downloads directory
- Fix download link for huge MR diffs - Fix download link for huge MR diffs
- Expose event and mergerequest timestamps in API
v 6.7.3 v 6.7.3
- Fix the merge notification email not being sent (Pierre de La Morinerie) - Fix the merge notification email not being sent (Pierre de La Morinerie)
......
...@@ -117,22 +117,22 @@ module API ...@@ -117,22 +117,22 @@ module API
class ProjectEntity < Grape::Entity class ProjectEntity < Grape::Entity
expose :id, :iid expose :id, :iid
expose (:project_id) { |entity| entity.project.id } expose (:project_id) { |entity| entity.project.id }
expose :title, :description
expose :state, :created_at, :updated_at
end end
class Milestone < ProjectEntity class Milestone < ProjectEntity
expose :title, :description, :due_date, :state, :updated_at, :created_at expose :due_date
end end
class Issue < ProjectEntity class Issue < ProjectEntity
expose :title, :description
expose :label_list, as: :labels expose :label_list, as: :labels
expose :milestone, using: Entities::Milestone expose :milestone, using: Entities::Milestone
expose :assignee, :author, using: Entities::UserBasic expose :assignee, :author, using: Entities::UserBasic
expose :state, :updated_at, :created_at
end end
class MergeRequest < ProjectEntity 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 :author, :assignee, using: Entities::UserBasic
expose :source_project_id, :target_project_id expose :source_project_id, :target_project_id
end end
...@@ -158,6 +158,7 @@ module API ...@@ -158,6 +158,7 @@ module API
expose :title, :project_id, :action_name expose :title, :project_id, :action_name
expose :target_id, :target_type, :author_id expose :target_id, :target_type, :author_id
expose :data, :target_title expose :data, :target_title
expose :created_at
end end
class Namespace < Grape::Entity class Namespace < Grape::Entity
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment