Commit 4e9466ae authored by Nathan Friend's avatar Nathan Friend

Merge branch 'jivanvl-change-default-prop-stage-component' into 'master'

Change default value for isMergeTrain prop

See merge request gitlab-org/gitlab!55780
parents 32f34cf9 a0587f3b
...@@ -41,7 +41,7 @@ export default { ...@@ -41,7 +41,7 @@ export default {
isMergeTrain: { isMergeTrain: {
type: Boolean, type: Boolean,
required: false, required: false,
default: true, default: false,
}, },
}, },
data() { data() {
......
...@@ -195,9 +195,7 @@ describe('Pipelines stage component', () => { ...@@ -195,9 +195,7 @@ describe('Pipelines stage component', () => {
describe('With merge trains disabled', () => { describe('With merge trains disabled', () => {
beforeEach(async () => { beforeEach(async () => {
mock.onGet(dropdownPath).reply(200, stageReply); mock.onGet(dropdownPath).reply(200, stageReply);
createComponent({ createComponent();
isMergeTrain: false,
});
await openStageDropdown(); await openStageDropdown();
await axios.waitForAll(); await axios.waitForAll();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment