summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue')
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue21
1 files changed, 16 insertions, 5 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue
index f0c624c5d8d..a1eb77479bd 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue
@@ -2,7 +2,7 @@
import { GlButton } from '@gitlab/ui';
import { produce } from 'immer';
import $ from 'jquery';
-import { deprecatedCreateFlash as createFlash } from '~/flash';
+import createFlash from '~/flash';
import { __ } from '~/locale';
import MergeRequest from '~/merge_request';
import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
@@ -76,7 +76,9 @@ export default {
},
) {
if (errors?.length) {
- createFlash(__('Something went wrong. Please try again.'));
+ createFlash({
+ message: __('Something went wrong. Please try again.'),
+ });
return;
}
@@ -121,11 +123,18 @@ export default {
},
},
}) => {
- createFlash(__('The merge request can now be merged.'), 'notice');
+ createFlash({
+ message: __('The merge request can now be merged.'),
+ type: 'notice',
+ });
$('.merge-request .detail-page-description .title').text(title);
},
)
- .catch(() => createFlash(__('Something went wrong. Please try again.')))
+ .catch(() =>
+ createFlash({
+ message: __('Something went wrong. Please try again.'),
+ }),
+ )
.finally(() => {
this.isMakingRequest = false;
});
@@ -144,7 +153,9 @@ export default {
})
.catch(() => {
this.isMakingRequest = false;
- createFlash(__('Something went wrong. Please try again.'));
+ createFlash({
+ message: __('Something went wrong. Please try again.'),
+ });
});
}
},