Merge branch 'sh-rebase-error-frontend-cleanup' into 'master'

Drop extraneous flash message when rebase error occurs See merge request gitlab-org/gitlab!75669

Merge branch 'sh-rebase-error-frontend-cleanup' into 'master'
Drop extraneous flash message when rebase error occurs See merge request gitlab-org/gitlab!75669
d8506e9b · Stan Hu · 465100e5 · 25c66e64 · d8506e9b
Commit d8506e9b authored Dec 03, 2021 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue ...rge_request_widget/components/states/mr_widget_rebase.vue +0 -3

No files found.
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue
@@ -121,9 +121,6 @@ export default {
            if (res.merge_error && res.merge_error.length) {
              this.rebasingError = res.merge_error;
-              createFlash({
-                message: __('Something went wrong. Please try again.'),
-              });
            }
            eventHub.$emit('MRWidgetRebaseSuccess');