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
cba17c29
Commit
cba17c29
authored
Jun 05, 2017
by
Simon Knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
don't disable Rebase button for MR without Approvals
parent
ee367580
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
38 deletions
+5
-38
app/assets/javascripts/vue_merge_request_widget/ee/components/states/mr_widget_rebase.js
...e_request_widget/ee/components/states/mr_widget_rebase.js
+1
-12
changelogs/unreleased-ee/2385-rebase-without-approvals.yml
changelogs/unreleased-ee/2385-rebase-without-approvals.yml
+4
-0
spec/features/merge_requests/approvals_spec.rb
spec/features/merge_requests/approvals_spec.rb
+0
-26
No files found.
app/assets/javascripts/vue_merge_request_widget/ee/components/states/mr_widget_rebase.js
View file @
cba17c29
...
@@ -19,11 +19,6 @@ export default {
...
@@ -19,11 +19,6 @@ export default {
isMakingRequest
:
false
,
isMakingRequest
:
false
,
};
};
},
},
computed
:
{
isApprovalsLeft
()
{
return
this
.
mr
.
approvals
&&
this
.
mr
.
approvalsLeft
;
},
},
methods
:
{
methods
:
{
rebase
()
{
rebase
()
{
this
.
isMakingRequest
=
true
;
this
.
isMakingRequest
=
true
;
...
@@ -87,7 +82,7 @@ export default {
...
@@ -87,7 +82,7 @@ export default {
<div class="accept-merge-holder clearfix js-toggle-container accept-action">
<div class="accept-merge-holder clearfix js-toggle-container accept-action">
<button
<button
class="btn btn-small btn-reopen btn-success"
class="btn btn-small btn-reopen btn-success"
:disabled="is
ApprovalsLeft || is
MakingRequest"
:disabled="isMakingRequest"
@click="rebase">
@click="rebase">
<i
<i
v-if="isMakingRequest"
v-if="isMakingRequest"
...
@@ -101,12 +96,6 @@ export default {
...
@@ -101,12 +96,6 @@ export default {
branch into source branch to allow this merge request to be merged.
branch into source branch to allow this merge request to be merged.
</span>
</span>
</div>
</div>
<div class="mr-info-list">
<div class="legend"></div>
<p v-if="isApprovalsLeft">
Rebasing is disabled until merge request has been approved.
</p>
</div>
</template>
</template>
</div>
</div>
</div>
</div>
...
...
changelogs/unreleased-ee/2385-rebase-without-approvals.yml
0 → 100644
View file @
cba17c29
---
title
:
fix Rebase being disabled for unapproved MRs
merge_request
:
author
:
spec/features/merge_requests/approvals_spec.rb
View file @
cba17c29
...
@@ -264,32 +264,6 @@ feature 'Merge request approvals', js: true, feature: true do
...
@@ -264,32 +264,6 @@ feature 'Merge request approvals', js: true, feature: true do
expect
(
page
).
to
have_button
(
'Merge when pipeline succeeds'
,
disabled:
true
)
expect
(
page
).
to
have_button
(
'Merge when pipeline succeeds'
,
disabled:
true
)
end
end
end
end
context
'when rebase is needed but no approval given'
,
js:
true
do
let
(
:project
)
do
create
(
:project
,
approvals_before_merge:
1
,
merge_requests_rebase_enabled:
true
,
merge_requests_ff_only_enabled:
true
)
end
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
)
}
before
do
create
:approver_group
,
group:
group
,
target:
merge_request
visit
namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request
)
end
it
'I am unable to rebase the merge request'
do
# before approval status is loaded
expect
(
page
).
to
have_button
(
"Rebase"
,
disabled:
true
)
wait_for_requests
# after approval status is loaded
expect
(
page
).
to
have_button
(
"Rebase"
,
disabled:
true
)
end
end
end
end
context
'when merge when discussions resolved is active'
,
:js
do
context
'when merge when discussions resolved is active'
,
:js
do
...
...
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