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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
29c807ce
Commit
29c807ce
authored
Sep 02, 2013
by
Islam Amer
Committed by
Jacob Vosmaer
Oct 08, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Expose votes in merge request api
Signed-off-by:
Islam Amer
<
islam.amer@jollamobile.com
>
parent
07437ac3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
1 deletion
+9
-1
doc/api/merge_requests.md
doc/api/merge_requests.md
+8
-0
lib/api/entities.rb
lib/api/entities.rb
+1
-1
No files found.
doc/api/merge_requests.md
View file @
29c807ce
...
@@ -20,6 +20,8 @@ Parameters:
...
@@ -20,6 +20,8 @@ Parameters:
"project_id"
:
3
,
"project_id"
:
3
,
"title"
:
"test1"
,
"title"
:
"test1"
,
"state"
:
"opened"
,
"state"
:
"opened"
,
"upvotes"
:
0
,
"downvotes"
:
0
,
"author"
:{
"author"
:{
"id"
:
1
,
"id"
:
1
,
"username"
:
"admin"
,
"username"
:
"admin"
,
...
@@ -62,6 +64,8 @@ Parameters:
...
@@ -62,6 +64,8 @@ Parameters:
"project_id"
:
3
,
"project_id"
:
3
,
"title"
:
"test1"
,
"title"
:
"test1"
,
"state"
:
"merged"
,
"state"
:
"merged"
,
"upvotes"
:
0
,
"downvotes"
:
0
,
"author"
:{
"author"
:{
"id"
:
1
,
"id"
:
1
,
"username"
:
"admin"
,
"username"
:
"admin"
,
...
@@ -106,6 +110,8 @@ Parameters:
...
@@ -106,6 +110,8 @@ Parameters:
"project_id"
:
3
,
"project_id"
:
3
,
"title"
:
"test1"
,
"title"
:
"test1"
,
"state"
:
"opened"
,
"state"
:
"opened"
,
"upvotes"
:
0
,
"downvotes"
:
0
,
"author"
:{
"author"
:{
"id"
:
1
,
"id"
:
1
,
"username"
:
"admin"
,
"username"
:
"admin"
,
...
@@ -152,6 +158,8 @@ Parameters:
...
@@ -152,6 +158,8 @@ Parameters:
"project_id"
:
3
,
"project_id"
:
3
,
"title"
:
"test1"
,
"title"
:
"test1"
,
"state"
:
"opened"
,
"state"
:
"opened"
,
"upvotes"
:
0
,
"downvotes"
:
0
,
"author"
:{
"author"
:{
"id"
:
1
,
"id"
:
1
,
"username"
:
"admin"
,
"username"
:
"admin"
,
...
...
lib/api/entities.rb
View file @
29c807ce
...
@@ -112,7 +112,7 @@ module API
...
@@ -112,7 +112,7 @@ module API
end
end
class
MergeRequest
<
Grape
::
Entity
class
MergeRequest
<
Grape
::
Entity
expose
:id
,
:target_branch
,
:source_branch
,
:title
,
:state
expose
:id
,
:target_branch
,
:source_branch
,
:title
,
:state
,
:upvotes
,
:downvotes
expose
:target_project_id
,
as: :project_id
expose
:target_project_id
,
as: :project_id
expose
:author
,
:assignee
,
using:
Entities
::
UserBasic
expose
:author
,
:assignee
,
using:
Entities
::
UserBasic
end
end
...
...
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