diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-28 00:09:43 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-28 00:09:43 +0300 |
commit | ff2a881e2038a523c71f0d3f044c496bb7617fd5 (patch) | |
tree | 70af5fc4521dc0294b7698d84ef3781f7765324c /app/assets/javascripts/merge_request_tabs.js | |
parent | c478950af927edd3cdafbdab68cb98601be2ee8c (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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js index d55e942dafa..124b14a9845 100644 --- a/app/assets/javascripts/merge_request_tabs.js +++ b/app/assets/javascripts/merge_request_tabs.js @@ -13,7 +13,7 @@ import axios from './lib/utils/axios_utils'; import { localTimeAgo } from './lib/utils/datetime_utility'; import { isInVueNoteablePage } from './lib/utils/dom_utils'; -import { __ } from './locale'; +import { __, s__ } from './locale'; import syntaxHighlight from './syntax_highlight'; // MergeRequestTabs @@ -316,7 +316,7 @@ export default class MergeRequestTabs { }) .catch(() => { toggleLoader(false); - createAlert({ message: __('MergeRequest|Failed to load the page') }); + createAlert({ message: s__('MergeRequest|Failed to load the page') }); }); } |