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
300653a5
Commit
300653a5
authored
Sep 02, 2021
by
pburdette
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix merge immediatley
Fix merge immeditaley when a pipeline has failed.
parent
b2a851ad
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
...merge_request_widget/components/states/ready_to_merge.vue
+1
-1
ee/spec/frontend/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js
...widget/components/states/mr_widget_ready_to_merge_spec.js
+2
-1
No files found.
app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
View file @
300653a5
...
@@ -396,7 +396,7 @@ export default {
...
@@ -396,7 +396,7 @@ export default {
}
}
},
},
onMergeImmediatelyConfirmation
()
{
onMergeImmediatelyConfirmation
()
{
this
.
handleMergeButtonClick
(
false
,
true
);
this
.
handleMergeButtonClick
(
false
,
true
,
true
);
},
},
initiateMergePolling
()
{
initiateMergePolling
()
{
simplePoll
(
simplePoll
(
...
...
ee/spec/frontend/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js
View file @
300653a5
...
@@ -385,7 +385,8 @@ describe('ReadyToMerge', () => {
...
@@ -385,7 +385,8 @@ describe('ReadyToMerge', () => {
return
wrapper
.
vm
.
$nextTick
();
return
wrapper
.
vm
.
$nextTick
();
})
})
.
then
(()
=>
{
.
then
(()
=>
{
expect
(
vm
.
handleMergeButtonClick
).
toHaveBeenCalled
();
// false (no auto merge), true (merge immediately), true (confirmation clicked)
expect
(
vm
.
handleMergeButtonClick
).
toHaveBeenCalledWith
(
false
,
true
,
true
);
});
});
});
});
...
...
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