Commit 2bf42515 authored by Nourdin el Bacha's avatar Nourdin el Bacha

Removes the check for sourceBranchProtected

The UI should render the `resolve conflicts` button if the user can
push to source branch, regardless of branch protection.

fixed: https://gitlab.com/gitlab-org/gitlab/-/issues/355850
parent 3e060e01
......@@ -82,17 +82,8 @@ export default {
return this.mr.shouldBeRebased;
},
sourceBranchProtected() {
if (this.glFeatures.mergeRequestWidgetGraphql) {
return this.stateData.sourceBranchProtected;
}
return this.mr.sourceBranchProtected;
},
showResolveButton() {
return (
this.mr.conflictResolutionPath && this.canPushToSourceBranch && !this.sourceBranchProtected
);
return this.mr.conflictResolutionPath && this.canPushToSourceBranch;
},
},
};
......
......@@ -224,8 +224,8 @@ describe('MRWidgetConflicts', () => {
});
});
it('should not allow you to resolve the conflicts', () => {
expect(findResolveButton().exists()).toBe(false);
it('should allow you to resolve the conflicts', () => {
expect(findResolveButton().exists()).toBe(true);
});
});
......
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