diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-18 09:10:20 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-18 09:10:20 +0300 |
commit | 3bce40cd27cae740c5de57dacb5ed19fba397007 (patch) | |
tree | 67890f5787bae757bd75af075c0dac3af05c5a8b /app/assets/javascripts/merge_conflicts | |
parent | b7a1160154d52bad5af11a8155369de827df2f74 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/merge_conflicts')
-rw-r--r-- | app/assets/javascripts/merge_conflicts/components/diff_file_editor.vue | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/merge_conflicts/components/diff_file_editor.vue b/app/assets/javascripts/merge_conflicts/components/diff_file_editor.vue index 04e493712ec..f09aebea431 100644 --- a/app/assets/javascripts/merge_conflicts/components/diff_file_editor.vue +++ b/app/assets/javascripts/merge_conflicts/components/diff_file_editor.vue @@ -2,7 +2,7 @@ import { GlButton } from '@gitlab/ui'; import { debounce } from 'lodash'; import { mapActions } from 'vuex'; -import { deprecatedCreateFlash as flash } from '~/flash'; +import createFlash from '~/flash'; import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; import { INTERACTIVE_RESOLVE_MODE } from '../constants'; @@ -75,7 +75,9 @@ export default { }, ) .catch(() => { - flash(__('An error occurred while loading the file')); + createFlash({ + message: __('An error occurred while loading the file'), + }); }); }, saveDiffResolution() { |