BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
69096ad9
Unverified
Commit
69096ad9
authored
Aug 03, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update merge request versions API to match styleguide
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
9a5f4087
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
12 deletions
+18
-12
merge_requests.md
doc/api/merge_requests.md
+8
-3
merge_request_diffs.rb
lib/api/merge_request_diffs.rb
+10
-9
No files found.
doc/api/merge_requests.md
View file @
69096ad9
...
@@ -903,11 +903,16 @@ Get a list of merge request diff versions.
...
@@ -903,11 +903,16 @@ Get a list of merge request diff versions.
GET /projects/:id/merge_requests/:merge_request_id/versions
GET /projects/:id/merge_requests/:merge_request_id/versions
```
```
Parameters:
| Attribute | Type | Required | Description |
| --------- | ------- | -------- | --------------------- |
|
`id`
| integer | yes | The ID of the project |
|
`merge_request_id`
| integer | yes | The ID of the merge request |
-
`id`
(required) - The ID of a project
```
bash
-
`merge_request_id`
(required) - The ID of MR
curl
-H
"PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK"
https://gitlab.example.com/api/v3/projects/1/merge_requests/1/versions
```
Example response:
```
json
```
json
[{
[{
...
...
lib/api/merge_request_diffs.rb
View file @
69096ad9
...
@@ -4,15 +4,16 @@ module API
...
@@ -4,15 +4,16 @@ module API
before
{
authenticate!
}
before
{
authenticate!
}
resource
:projects
do
resource
:projects
do
# List merge requests diff versions
desc
'Get a list of merge request diff versions'
do
#
detail
'This feature was introduced in GitLab 8.12.'
# Parameters:
success
Entities
::
MergeRequestDiff
# id (required) - The ID of a project
end
# merge_request_id (required) - The ID of MR
#
params
do
# Example:
requires
:id
,
type:
Integer
,
desc:
'The ID of a project'
# GET /projects/:id/merge_requests/:merge_request_id/versions
requests
:merge_request_id
,
type:
Integer
,
desc:
'The ID of a merge request'
#
end
get
":id/merge_requests/:merge_request_id/versions"
do
get
":id/merge_requests/:merge_request_id/versions"
do
merge_request
=
user_project
.
merge_requests
.
merge_request
=
user_project
.
merge_requests
.
find
(
params
[
:merge_request_id
])
find
(
params
[
:merge_request_id
])
...
...
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