Merge branch 'remove-check-sourceBranchProtected-for-showResolveButton' into 'master'

Removes the check for sourceBranchProtected

See merge request gitlab-org/gitlab!82984

app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue

@@ -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;
     },
   },
 };

spec/frontend/vue_mr_widget/components/states/mr_widget_conflicts_spec.js

@@ -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);
         });
       });