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
11f2c8a2
Commit
11f2c8a2
authored
Dec 20, 2016
by
http://jneen.net/
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
move the API routes back to separate endpoints
parent
434466ec
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
7 deletions
+8
-7
lib/api/merge_requests.rb
lib/api/merge_requests.rb
+2
-2
spec/requests/api/merge_requests_spec.rb
spec/requests/api/merge_requests_spec.rb
+6
-5
No files found.
lib/api/merge_requests.rb
View file @
11f2c8a2
...
...
@@ -302,7 +302,7 @@ module API
# Examples:
# POST /projects/:id/merge_requests/:merge_request_id/approvals
#
post
"
#{
path
}
/approv
als
"
do
post
"
#{
path
}
/approv
e
"
do
merge_request
=
user_project
.
merge_requests
.
find
(
params
[
:merge_request_id
])
unauthorized!
unless
merge_request
.
can_approve?
(
current_user
)
...
...
@@ -314,7 +314,7 @@ module API
present
merge_request
,
with:
Entities
::
MergeRequestApprovals
,
current_user:
current_user
end
delete
"
#{
path
}
/
approvals
"
do
delete
"
#{
path
}
/
unapprove
"
do
merge_request
=
user_project
.
merge_requests
.
find
(
params
[
:merge_request_id
])
not_found!
unless
merge_request
.
has_approved?
(
current_user
)
...
...
spec/requests/api/merge_requests_spec.rb
View file @
11f2c8a2
...
...
@@ -734,11 +734,11 @@ describe API::MergeRequests, api: true do
end
end
describe
'POST :id/merge_requests/:merge_request_id/approv
als
'
do
describe
'POST :id/merge_requests/:merge_request_id/approv
e
'
do
before
{
project
.
update_attribute
(
:approvals_before_merge
,
2
)
}
context
'as the author of the merge request'
do
before
{
post
api
(
"/projects/
#{
project
.
id
}
/merge_requests/
#{
merge_request
.
id
}
/approv
als
"
,
user
)
}
before
{
post
api
(
"/projects/
#{
project
.
id
}
/merge_requests/
#{
merge_request
.
id
}
/approv
e
"
,
user
)
}
it
'returns a 401'
do
expect
(
response
).
to
have_http_status
(
401
)
...
...
@@ -752,7 +752,7 @@ describe API::MergeRequests, api: true do
project
.
team
<<
[
approver
,
:developer
]
project
.
team
<<
[
create
(
:user
),
:developer
]
post
api
(
"/projects/
#{
project
.
id
}
/merge_requests/
#{
merge_request
.
id
}
/approv
als
"
,
approver
)
post
api
(
"/projects/
#{
project
.
id
}
/merge_requests/
#{
merge_request
.
id
}
/approv
e
"
,
approver
)
end
it
'approves the merge request'
do
...
...
@@ -764,7 +764,7 @@ describe API::MergeRequests, api: true do
end
end
describe
'DELETE :id/merge_requests/:merge_request_id/
approvals
'
do
describe
'DELETE :id/merge_requests/:merge_request_id/
unapprove
'
do
before
{
project
.
update_attribute
(
:approvals_before_merge
,
2
)
}
context
'as a user who has approved the merge request'
do
...
...
@@ -778,7 +778,7 @@ describe API::MergeRequests, api: true do
merge_request
.
approvals
.
create
(
user:
approver
)
merge_request
.
approvals
.
create
(
user:
unapprover
)
delete
api
(
"/projects/
#{
project
.
id
}
/merge_requests/
#{
merge_request
.
id
}
/
approvals
"
,
unapprover
)
delete
api
(
"/projects/
#{
project
.
id
}
/merge_requests/
#{
merge_request
.
id
}
/
unapprove
"
,
unapprover
)
end
it
'unapproves the merge request'
do
...
...
@@ -792,6 +792,7 @@ describe API::MergeRequests, api: true do
end
end
end
def
mr_with_later_created_and_updated_at_time
merge_request
merge_request
.
created_at
+=
1
.
hour
...
...
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