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
iv
gitlab-ce
Commits
71f87ffb
Commit
71f87ffb
authored
Aug 13, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6788 from CingleVue/master
Patched `MergeRequest` to return more data.
parents
32de6691
d048a277
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
doc/api/merge_requests.md
doc/api/merge_requests.md
+6
-3
lib/api/entities.rb
lib/api/entities.rb
+2
-0
No files found.
doc/api/merge_requests.md
View file @
71f87ffb
...
@@ -42,7 +42,8 @@ Parameters:
...
@@ -42,7 +42,8 @@ Parameters:
"name"
:
"Administrator"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
"created_at"
:
"2012-04-29T08:46:00Z"
}
},
"description"
:
"fixed login page css paddings"
}
}
]
]
```
```
...
@@ -86,7 +87,8 @@ Parameters:
...
@@ -86,7 +87,8 @@ Parameters:
"name"
:
"Administrator"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
"created_at"
:
"2012-04-29T08:46:00Z"
}
},
"description"
:
"fixed login page css paddings"
}
}
```
```
...
@@ -132,7 +134,8 @@ Parameters:
...
@@ -132,7 +134,8 @@ Parameters:
"name"
:
"Administrator"
,
"name"
:
"Administrator"
,
"state"
:
"active"
,
"state"
:
"active"
,
"created_at"
:
"2012-04-29T08:46:00Z"
"created_at"
:
"2012-04-29T08:46:00Z"
}
},
"description"
:
"fixed login page css paddings"
}
}
```
```
...
...
lib/api/entities.rb
View file @
71f87ffb
...
@@ -137,6 +137,8 @@ module API
...
@@ -137,6 +137,8 @@ module API
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
expose
:label_names
,
as: :labels
expose
:label_names
,
as: :labels
expose
:description
expose
:milestone
,
using:
Entities
::
Milestone
end
end
class
SSHKey
<
Grape
::
Entity
class
SSHKey
<
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