Skip to content
Snippets Groups Projects

Added merge checks component to mr_widget_options

Merged Phil Hughes requested to merge ph/mergeChecksInWidget into master
4 files
+ 21
28
Compare changes
  • Side-by-side
  • Inline
Files
4
@@ -196,7 +196,9 @@ export default class MergeRequestStore {
}
this.commitsCount = mergeRequest.commitCount;
this.branchMissing = !mergeRequest.sourceBranchExists || !mergeRequest.targetBranchExists;
this.branchMissing =
mergeRequest.detailedMergeStatus !== 'NOT_OPEN' &&
(!mergeRequest.sourceBranchExists || !mergeRequest.targetBranchExists);
this.hasConflicts = mergeRequest.conflicts;
this.hasMergeableDiscussionsState = mergeRequest.mergeableDiscussionsState === false;
this.mergeError = mergeRequest.mergeError;
Loading