diff options
| author | Nathan Friend <nathan@gitlab.com> | 2019-06-03 14:23:40 -0300 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2019-06-12 16:23:34 +0800 |
| commit | 059b3e369ddea3cab03eccf3c1c18546a62b9c13 (patch) | |
| tree | c3f8787208629045e3d6300fecc6937e1b64f917 /app/assets/javascripts/vue_merge_request_widget | |
| parent | e206e66bbba9e36a75eb485f65c26f1d5a05e90f (diff) | |
| download | gitlab-ce-059b3e369ddea3cab03eccf3c1c18546a62b9c13.tar.gz | |
Remove "target branch advanced" warning from FE code (CE)ce-remove-merge-request-pipeline-checkes
Removes the "target branch advanced" warning from the frontend
as it is no longer needed due to the new merge trains feature.
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue | 20 |
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 d02bb2f341d..0d2d83bc1cc 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> |