Merge branch 'ce-remove-merge-request-pipeline-checkes' into 'master'

CE backport for gitlab-org/gitlab-ee!12309: Remove merge request pipeline check in mergeable method

See merge request gitlab-org/gitlab-ce!29074

app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue

@@ -117,14 +117,6 @@ export default {
         this.mr.mergePipelinesEnabled && this.mr.sourceProjectId !== this.mr.targetProjectId,
       );
     },
-    showTargetBranchAdvancedError() {
-      return Boolean(
-        this.mr.isOpen &&
-          this.mr.pipeline &&
-          this.mr.pipeline.target_sha &&
-          this.mr.pipeline.target_sha !== this.mr.targetBranchSha,
-      );
-    },
     mergeError() {
       return sprintf(s__('mrWidget|Merge failed: %{mergeError}. Please try again.'), {
         mergeError: this.mr.mergeError,
@@ -363,18 +355,6 @@ export default {
             }}
           </mr-widget-alert-message>
 
-          <mr-widget-alert-message
-            v-if="showTargetBranchAdvancedError"
-            type="danger"
-            :help-path="mr.mergeRequestPipelinesHelpPath"
-          >
-            {{
-              s__(
-                'mrWidget|The target branch has advanced, which invalidates the merge request pipeline. Please update the source branch and retry merging',
-              )
-            }}
-          </mr-widget-alert-message>
-
           <mr-widget-alert-message v-if="mr.mergeError" type="danger">
             {{ mergeError }}
           </mr-widget-alert-message>

locale/gitlab.pot

@@ -12411,9 +12411,6 @@ msgstr ""
 msgid "mrWidget|The source branch will not be deleted"
 msgstr ""
 
-msgid "mrWidget|The target branch has advanced, which invalidates the merge request pipeline. Please update the source branch and retry merging"
-msgstr ""
-
 msgid "mrWidget|There are merge conflicts"
 msgstr ""
 

spec/javascripts/vue_mr_widget/mr_widget_options_spec.js

@@ -222,60 +222,6 @@ describe('mrWidgetOptions', () => {
         });
       });
     });
-
-    describe('showTargetBranchAdvancedError', () => {
-      describe(`when the pipeline's target_sha property doesn't exist`, () => {
-        beforeEach(done => {
-          Vue.set(vm.mr, 'isOpen', true);
-          Vue.set(vm.mr.pipeline, 'target_sha', undefined);
-          Vue.set(vm.mr, 'targetBranchSha', 'abcd');
-          vm.$nextTick(done);
-        });
-
-        it('should be false', () => {
-          expect(vm.showTargetBranchAdvancedError).toEqual(false);
-        });
-      });
-
-      describe(`when the pipeline's target_sha matches the target branch's sha`, () => {
-        beforeEach(done => {
-          Vue.set(vm.mr, 'isOpen', true);
-          Vue.set(vm.mr.pipeline, 'target_sha', 'abcd');
-          Vue.set(vm.mr, 'targetBranchSha', 'abcd');
-          vm.$nextTick(done);
-        });
-
-        it('should be false', () => {
-          expect(vm.showTargetBranchAdvancedError).toEqual(false);
-        });
-      });
-
-      describe(`when the merge request is not open`, () => {
-        beforeEach(done => {
-          Vue.set(vm.mr, 'isOpen', false);
-          Vue.set(vm.mr.pipeline, 'target_sha', 'abcd');
-          Vue.set(vm.mr, 'targetBranchSha', 'bcde');
-          vm.$nextTick(done);
-        });
-
-        it('should be false', () => {
-          expect(vm.showTargetBranchAdvancedError).toEqual(false);
-        });
-      });
-
-      describe(`when the pipeline's target_sha does not match the target branch's sha`, () => {
-        beforeEach(done => {
-          Vue.set(vm.mr, 'isOpen', true);
-          Vue.set(vm.mr.pipeline, 'target_sha', 'abcd');
-          Vue.set(vm.mr, 'targetBranchSha', 'bcde');
-          vm.$nextTick(done);
-        });
-
-        it('should be true', () => {
-          expect(vm.showTargetBranchAdvancedError).toEqual(true);
-        });
-      });
-    });
   });
 
   describe('methods', () => {