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
20bd1e6b
Commit
20bd1e6b
authored
Sep 05, 2018
by
🙈 jacopo beschi 🙉
Committed by
Douwe Maan
Sep 05, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Return how many commits the source branch is behind the target branch through the API"
parent
cff47b20
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
2 deletions
+21
-2
changelogs/unreleased/36534-show-commit-behind-mr-api.yml
changelogs/unreleased/36534-show-commit-behind-mr-api.yml
+5
-0
doc/api/merge_requests.md
doc/api/merge_requests.md
+3
-1
lib/api/entities.rb
lib/api/entities.rb
+2
-0
lib/api/merge_requests.rb
lib/api/merge_requests.rb
+2
-1
spec/requests/api/merge_requests_spec.rb
spec/requests/api/merge_requests_spec.rb
+9
-0
No files found.
changelogs/unreleased/36534-show-commit-behind-mr-api.yml
0 → 100644
View file @
20bd1e6b
---
title
:
Adds diverged_commits_count field to GET api/v4/projects/:project_id/merge_requests/:merge_request_iid
merge_request
:
21405
author
:
Jacopo Beschi @jacopo-beschi
type
:
added
doc/api/merge_requests.md
View file @
20bd1e6b
...
@@ -352,6 +352,7 @@ Parameters:
...
@@ -352,6 +352,7 @@ Parameters:
-
`id`
(required) - The ID or
[
URL-encoded path of the project
](
README.md#namespaced-path-encoding
)
owned by the authenticated user
-
`id`
(required) - The ID or
[
URL-encoded path of the project
](
README.md#namespaced-path-encoding
)
owned by the authenticated user
-
`merge_request_iid`
(required) - The internal ID of the merge request
-
`merge_request_iid`
(required) - The internal ID of the merge request
-
`render_html`
(optional) - If
`true`
response includes rendered HTML for title and description
-
`render_html`
(optional) - If
`true`
response includes rendered HTML for title and description
-
`include_diverged_commits_count`
(optional) - If
`true`
response includes the commits behind the target branch
```
json
```
json
{
{
...
@@ -435,7 +436,8 @@ Parameters:
...
@@ -435,7 +436,8 @@ Parameters:
"username"
:
"root"
,
"username"
:
"root"
,
"id"
:
1
,
"id"
:
1
,
"name"
:
"Administrator"
"name"
:
"Administrator"
}
},
"diverged_commits_count"
:
2
}
}
```
```
...
...
lib/api/entities.rb
View file @
20bd1e6b
...
@@ -687,6 +687,8 @@ module API
...
@@ -687,6 +687,8 @@ module API
expose
:diff_refs
,
using:
Entities
::
DiffRefs
expose
:diff_refs
,
using:
Entities
::
DiffRefs
expose
:diverged_commits_count
,
as: :diverged_commits_count
,
if:
->
(
_
,
options
)
{
options
[
:include_diverged_commits_count
]
}
def
build_available?
(
options
)
def
build_available?
(
options
)
options
[
:project
]
&
.
feature_available?
(
:builds
,
options
[
:current_user
])
options
[
:project
]
&
.
feature_available?
(
:builds
,
options
[
:current_user
])
end
end
...
...
lib/api/merge_requests.rb
View file @
20bd1e6b
...
@@ -233,6 +233,7 @@ module API
...
@@ -233,6 +233,7 @@ module API
params
do
params
do
requires
:merge_request_iid
,
type:
Integer
,
desc:
'The IID of a merge request'
requires
:merge_request_iid
,
type:
Integer
,
desc:
'The IID of a merge request'
optional
:render_html
,
type:
Boolean
,
desc:
'Returns the description and title rendered HTML'
optional
:render_html
,
type:
Boolean
,
desc:
'Returns the description and title rendered HTML'
optional
:include_diverged_commits_count
,
type:
Boolean
,
desc:
'Returns the commits count behind the target branch'
end
end
desc
'Get a single merge request'
do
desc
'Get a single merge request'
do
success
Entities
::
MergeRequest
success
Entities
::
MergeRequest
...
@@ -240,7 +241,7 @@ module API
...
@@ -240,7 +241,7 @@ module API
get
':id/merge_requests/:merge_request_iid'
do
get
':id/merge_requests/:merge_request_iid'
do
merge_request
=
find_merge_request_with_access
(
params
[
:merge_request_iid
])
merge_request
=
find_merge_request_with_access
(
params
[
:merge_request_iid
])
present
merge_request
,
with:
Entities
::
MergeRequest
,
current_user:
current_user
,
project:
user_project
,
render_html:
params
[
:render_html
]
present
merge_request
,
with:
Entities
::
MergeRequest
,
current_user:
current_user
,
project:
user_project
,
render_html:
params
[
:render_html
]
,
include_diverged_commits_count:
params
[
:include_diverged_commits_count
]
end
end
desc
'Get the participants of a merge request'
do
desc
'Get the participants of a merge request'
do
...
...
spec/requests/api/merge_requests_spec.rb
View file @
20bd1e6b
...
@@ -353,6 +353,15 @@ describe API::MergeRequests do
...
@@ -353,6 +353,15 @@ describe API::MergeRequests do
end
end
end
end
it
'returns the commits behind the target branch when include_diverged_commits_count is present'
do
allow_any_instance_of
(
merge_request
.
class
).
to
receive
(
:diverged_commits_count
).
and_return
(
1
)
get
api
(
"/projects/
#{
project
.
id
}
/merge_requests/
#{
merge_request
.
iid
}
"
,
user
),
include_diverged_commits_count:
true
expect
(
response
).
to
have_gitlab_http_status
(
200
)
expect
(
json_response
[
'diverged_commits_count'
]).
to
eq
(
1
)
end
it
"returns a 404 error if merge_request_iid not found"
do
it
"returns a 404 error if merge_request_iid not found"
do
get
api
(
"/projects/
#{
project
.
id
}
/merge_requests/999"
,
user
)
get
api
(
"/projects/
#{
project
.
id
}
/merge_requests/999"
,
user
)
expect
(
response
).
to
have_gitlab_http_status
(
404
)
expect
(
response
).
to
have_gitlab_http_status
(
404
)
...
...
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