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
6a56ff9a
An error occurred while fetching merge requests data.
Commit
6a56ff9a
authored
5 years ago
by
Nathan Friend
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show merge immediately dialog even if pipeline hasn't succeeded
parent
9fc2e14b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
2 deletions
+13
-2
changelogs/unreleased/nfriend-atmtwps-merge-immediately-dialog.yml
...s/unreleased/nfriend-atmtwps-merge-immediately-dialog.yml
+5
-0
ee/app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js
...scripts/vue_merge_request_widget/mixins/ready_to_merge.js
+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
+7
-1
No files found.
changelogs/unreleased/nfriend-atmtwps-merge-immediately-dialog.yml
0 → 100644
View file @
6a56ff9a
---
title
:
Show merge immediately dialog even if the MR's pipeline hasn't finished
merge_request
:
21556
author
:
type
:
changed
This diff is collapsed.
Click to expand it.
ee/app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js
View file @
6a56ff9a
...
...
@@ -50,7 +50,7 @@ export default {
return
this
.
mr
.
isPipelineActive
&&
!
this
.
mr
.
onlyAllowMergeIfPipelineSucceeds
;
},
isMergeImmediatelyDangerous
()
{
return
this
.
mr
.
preferredAutoMergeStrategy
===
MT_MERGE_STRATEGY
;
return
[
MT_MERGE_STRATEGY
,
MTWPS_MERGE_STRATEGY
].
includes
(
this
.
mr
.
preferredAutoMergeStrategy
)
;
},
},
};
This diff is collapsed.
Click to expand it.
ee/spec/frontend/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js
View file @
6a56ff9a
...
...
@@ -154,7 +154,7 @@ describe('ReadyToMerge', () => {
});
describe
(
'
isMergeImmediatelyDangerous
'
,
()
=>
{
it
(
'
should return false if the preferred auto merge strategy is not merge train
s
'
,
()
=>
{
it
(
'
should return false if the preferred auto merge strategy is not merge train
-related
'
,
()
=>
{
factory
({
preferredAutoMergeStrategy
:
MWPS_MERGE_STRATEGY
});
expect
(
vm
.
isMergeImmediatelyDangerous
).
toBe
(
false
);
...
...
@@ -165,6 +165,12 @@ describe('ReadyToMerge', () => {
expect
(
vm
.
isMergeImmediatelyDangerous
).
toBe
(
true
);
});
it
(
'
should return true if the preferred auto merge strategy is merge trains when pipeline succeeds
'
,
()
=>
{
factory
({
preferredAutoMergeStrategy
:
MTWPS_MERGE_STRATEGY
});
expect
(
vm
.
isMergeImmediatelyDangerous
).
toBe
(
true
);
});
});
});
...
...
This diff is collapsed.
Click to expand it.
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