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_request_tabs.js | |
parent | b7a1160154d52bad5af11a8155369de827df2f74 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/merge_request_tabs.js')
-rw-r--r-- | app/assets/javascripts/merge_request_tabs.js | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js index d5db9f43d09..602d6ef611f 100644 --- a/app/assets/javascripts/merge_request_tabs.js +++ b/app/assets/javascripts/merge_request_tabs.js @@ -8,7 +8,7 @@ import createEventHub from '~/helpers/event_hub_factory'; import initAddContextCommitsTriggers from './add_context_commits_modal'; import BlobForkSuggestion from './blob/blob_fork_suggestion'; import Diff from './diff'; -import { deprecatedCreateFlash as flash } from './flash'; +import createFlash from './flash'; import initChangesDropdown from './init_changes_dropdown'; import axios from './lib/utils/axios_utils'; import { @@ -345,7 +345,9 @@ export default class MergeRequestTabs { }) .catch(() => { this.toggleLoading(false); - flash(__('An error occurred while fetching this tab.')); + createFlash({ + message: __('An error occurred while fetching this tab.'), + }); }); } @@ -446,7 +448,9 @@ export default class MergeRequestTabs { }) .catch(() => { this.toggleLoading(false); - flash(__('An error occurred while fetching this tab.')); + createFlash({ + message: __('An error occurred while fetching this tab.'), + }); }); } |