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
8ad8afd5
Commit
8ad8afd5
authored
Dec 14, 2016
by
http://jneen.net/
Committed by
Bryce Johnson
Dec 17, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add suggested_approvers to the approval json
parent
662b203b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
0 deletions
+7
-0
lib/api/entities.rb
lib/api/entities.rb
+1
-0
spec/controllers/projects/merge_requests_controller_spec.rb
spec/controllers/projects/merge_requests_controller_spec.rb
+6
-0
No files found.
lib/api/entities.rb
View file @
8ad8afd5
...
...
@@ -318,6 +318,7 @@ module API
expose
:approvals_required
expose
:approvals_left
expose
:approvals
,
as: :approved_by
,
using:
Entities
::
Approvals
expose
:approvers_left
,
as: :suggested_approvers
,
using:
Entities
::
UserBasic
expose
:user_has_approved
do
|
merge_request
,
options
|
merge_request
.
has_approved?
(
options
[
:current_user
])
...
...
spec/controllers/projects/merge_requests_controller_spec.rb
View file @
8ad8afd5
...
...
@@ -135,6 +135,7 @@ describe Projects::MergeRequestsController do
before
do
merge_request
.
update_attribute
:approvals_before_merge
,
2
project
.
team
<<
[
approver
,
:developer
]
project
.
approver_ids
=
[
user
,
approver
].
map
(
&
:id
).
join
(
','
)
end
describe
'approve'
do
...
...
@@ -153,6 +154,8 @@ describe Projects::MergeRequestsController do
expect
(
json_response
[
'approved_by'
][
0
][
'user'
][
'username'
]).
to
eq
user
.
username
expect
(
json_response
[
'user_has_approved'
]).
to
be
true
expect
(
json_response
[
'user_can_approve'
]).
to
be
false
expect
(
json_response
[
'suggested_approvers'
].
size
).
to
eq
1
expect
(
json_response
[
'suggested_approvers'
][
0
][
'username'
]).
to
eq
approver
.
username
end
end
...
...
@@ -173,6 +176,8 @@ describe Projects::MergeRequestsController do
expect
(
json_response
[
'approved_by'
][
0
][
'user'
][
'username'
]).
to
eq
approver
.
username
expect
(
json_response
[
'user_has_approved'
]).
to
be
false
expect
(
json_response
[
'user_can_approve'
]).
to
be
true
expect
(
json_response
[
'suggested_approvers'
].
size
).
to
eq
1
expect
(
json_response
[
'suggested_approvers'
][
0
][
'username'
]).
to
eq
user
.
username
end
end
...
...
@@ -192,6 +197,7 @@ describe Projects::MergeRequestsController do
expect
(
json_response
[
'approved_by'
]).
to
be_empty
expect
(
json_response
[
'user_has_approved'
]).
to
be
false
expect
(
json_response
[
'user_can_approve'
]).
to
be
true
expect
(
json_response
[
'suggested_approvers'
].
size
).
to
eq
2
end
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