Skip to content
Snippets Groups Projects

Show error message when pipelines disabled and Pipeline must succeed

1 unresolved thread
Files
6
@@ -58,7 +58,7 @@ export default {
@@ -58,7 +58,7 @@ export default {
status() {
status() {
const { pipeline, isPipelineFailed, hasCI, ciStatus } = this.mr;
const { pipeline, isPipelineFailed, hasCI, ciStatus } = this.mr;
if (hasCI && !ciStatus) {
if ((hasCI && !ciStatus) || this.hasPipelineMustSucceedConflict) {
return 'failed';
return 'failed';
} else if (this.isAutoMergeAvailable) {
} else if (this.isAutoMergeAvailable) {
return 'pending';
return 'pending';
@@ -83,7 +83,7 @@ export default {
@@ -83,7 +83,7 @@ export default {
this.status === 'failed' ||
this.status === 'failed' ||
!this.commitMessage.length ||
!this.commitMessage.length ||
!this.mr.isMergeAllowed ||
!this.mr.isMergeAllowed ||
!this.mr.isApproved
this.mr.preventMerge
) {
) {
return 'warning';
return 'warning';
}
}
Loading