summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2019-06-12 09:41:54 +0000
committerLin Jen-Shin <godfat@godfat.org>2019-06-12 09:41:54 +0000
commitd8f4779c7f7f0b75b89d7f48f8228c610b73c98a (patch)
tree627015b45f866769a2f54358781910b767497afa /app
parent6cf619668bc31464e588728424cfdff9a640b014 (diff)
parent059b3e369ddea3cab03eccf3c1c18546a62b9c13 (diff)
downloadgitlab-ce-d8f4779c7f7f0b75b89d7f48f8228c610b73c98a.tar.gz
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
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue20
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>