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

1 files changed, 0 insertions, 20 deletions

diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
index a39c4911dce..41386178a1e 100644
--- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
+++ b/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>