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
3c7b2632
Commit
3c7b2632
authored
Jun 28, 2017
by
Simon Knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
allow rebase for unapproved merge requests
parent
c67c4fb1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
4 deletions
+7
-4
app/controllers/ee/projects/merge_requests_controller.rb
app/controllers/ee/projects/merge_requests_controller.rb
+0
-1
changelogs/unreleased-ee/2753-unable-to-rebase-unapproved-merge-request.yml
...sed-ee/2753-unable-to-rebase-unapproved-merge-request.yml
+4
-0
spec/controllers/projects/merge_requests_controller_ee_spec.rb
...controllers/projects/merge_requests_controller_ee_spec.rb
+3
-3
No files found.
app/controllers/ee/projects/merge_requests_controller.rb
View file @
3c7b2632
...
...
@@ -15,7 +15,6 @@ module EE
def
rebase
return
access_denied!
unless
@merge_request
.
can_be_merged_by?
(
current_user
)
return
render_404
unless
@merge_request
.
approved?
RebaseWorker
.
perform_async
(
@merge_request
.
id
,
current_user
.
id
)
...
...
changelogs/unreleased-ee/2753-unable-to-rebase-unapproved-merge-request.yml
0 → 100644
View file @
3c7b2632
---
title
:
allow rebase for unapproved merge requests
merge_request
:
author
:
spec/controllers/projects/merge_requests_controller_ee_spec.rb
View file @
3c7b2632
...
...
@@ -371,12 +371,12 @@ describe Projects::MergeRequestsController do
context
'approvals pending'
do
let
(
:project
)
{
create
(
:project
,
approvals_before_merge:
1
)
}
it
'returns
404
'
do
expect_rebase_worker
.
never
it
'returns
200
'
do
expect_rebase_worker
post_rebase
expect
(
response
.
status
).
to
eq
(
404
)
expect
(
response
.
status
).
to
eq
(
200
)
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