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
db6142a8
Commit
db6142a8
authored
Jan 21, 2019
by
Mark Chao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change MR approval rule api
Now endpoints are under approval_settings scope.
parent
341838ac
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
5 deletions
+6
-5
ee/app/models/approval_state.rb
ee/app/models/approval_state.rb
+1
-1
ee/lib/api/merge_request_approvals.rb
ee/lib/api/merge_request_approvals.rb
+1
-1
ee/lib/ee/api/entities.rb
ee/lib/ee/api/entities.rb
+1
-0
ee/spec/requests/api/merge_request_approvals_spec.rb
ee/spec/requests/api/merge_request_approvals_spec.rb
+3
-3
No files found.
ee/app/models/approval_state.rb
View file @
db6142a8
...
...
@@ -51,7 +51,7 @@ class ApprovalState
end
def
overall_approvals_required
@overall_approvals_required
||=
[
project
.
approvals_before_merge
,
merge_request
.
approvals_before_merge
].
max
@overall_approvals_required
||=
[
project
.
approvals_before_merge
,
merge_request
.
approvals_before_merge
||
0
].
max
end
def
approved?
...
...
ee/lib/api/merge_request_approvals.rb
View file @
db6142a8
...
...
@@ -53,7 +53,7 @@ module API
success:
::
EE
::
API
::
Entities
::
MergeRequestApprovalRules
,
hidden:
true
}
get
'approval_
rule
s'
do
get
'approval_
setting
s'
do
merge_request
=
find_merge_request_with_access
(
params
[
:merge_request_iid
])
present
merge_request
.
approval_state
,
with:
::
EE
::
API
::
Entities
::
MergeRequestApprovalRules
,
current_user:
current_user
...
...
ee/lib/ee/api/entities.rb
View file @
db6142a8
...
...
@@ -264,6 +264,7 @@ module EE
# Decorates ApprovalState
class
MergeRequestApprovalRules
<
Grape
::
Entity
expose
:wrapped_approval_rules
,
as: :rules
,
using:
MergeRequestApprovalRule
expose
:overall_approvals_required
,
as: :fallback_approvals_required
end
# Decorates Project
...
...
ee/spec/requests/api/merge_request_approvals_spec.rb
View file @
db6142a8
...
...
@@ -484,7 +484,7 @@ describe "API::MergeRequestApprovals with approval_rule enabled" do
end
end
describe
'GET :id/merge_requests/:merge_request_iid/approval_
rule
s'
do
describe
'GET :id/merge_requests/:merge_request_iid/approval_
setting
s'
do
let!
(
:rule
)
{
create
(
:approval_merge_request_rule
,
merge_request:
merge_request
,
approvals_required:
2
,
name:
'foo'
)
}
it
'retrieves the approval rules details'
do
...
...
@@ -492,7 +492,7 @@ describe "API::MergeRequestApprovals with approval_rule enabled" do
merge_request
.
approvals
.
create
(
user:
approver
)
rule
.
users
<<
approver
get
api
(
"/projects/
#{
project
.
id
}
/merge_requests/
#{
merge_request
.
iid
}
/approval_
rule
s"
,
user
)
get
api
(
"/projects/
#{
project
.
id
}
/merge_requests/
#{
merge_request
.
iid
}
/approval_
setting
s"
,
user
)
expect
(
response
).
to
have_gitlab_http_status
(
200
)
expect
(
json_response
[
'rules'
].
size
).
to
eq
(
1
)
...
...
@@ -509,7 +509,7 @@ describe "API::MergeRequestApprovals with approval_rule enabled" do
private_group
=
create
:group
,
:private
rule
.
groups
<<
private_group
get
api
(
"/projects/
#{
project
.
id
}
/merge_requests/
#{
merge_request
.
iid
}
/approval_
rule
s"
,
user
)
get
api
(
"/projects/
#{
project
.
id
}
/merge_requests/
#{
merge_request
.
iid
}
/approval_
setting
s"
,
user
)
expect
(
response
).
to
have_gitlab_http_status
(
200
)
expect
(
json_response
[
'rules'
].
size
).
to
eq
(
1
)
...
...
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