Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
156465ce
Commit
156465ce
authored
Apr 13, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6747 from mrts/expose-event-and-mergerequest-timestamps-in-api
Expose event and mergerequest timestamps in API
parents
6d57acce
0da8428f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
CHANGELOG
CHANGELOG
+1
-0
lib/api/entities.rb
lib/api/entities.rb
+5
-4
No files found.
CHANGELOG
View file @
156465ce
...
@@ -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)
...
...
lib/api/entities.rb
View file @
156465ce
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment