diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-20 14:18:08 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-20 14:18:08 +0300 |
commit | 5afcbe03ead9ada87621888a31a62652b10a7e4f (patch) | |
tree | 9918b67a0d0f0bafa6542e839a8be37adf73102d /app/assets/javascripts/commons | |
parent | c97c0201564848c1f53226fe19d71fdcc472f7d0 (diff) |
Add latest changes from gitlab-org/gitlab@16-4-stable-eev16.4.0-rc42
Diffstat (limited to 'app/assets/javascripts/commons')
-rw-r--r-- | app/assets/javascripts/commons/gitlab_ui.js | 10 | ||||
-rw-r--r-- | app/assets/javascripts/commons/index.js | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/app/assets/javascripts/commons/gitlab_ui.js b/app/assets/javascripts/commons/gitlab_ui.js new file mode 100644 index 00000000000..4a9f79460da --- /dev/null +++ b/app/assets/javascripts/commons/gitlab_ui.js @@ -0,0 +1,10 @@ +import applyGitLabUIConfig from '@gitlab/ui/dist/config'; +import { __ } from '~/locale'; + +applyGitLabUIConfig({ + translations: { + 'GlSearchBoxByType.input.placeholder': __('Search'), + 'GlSearchBoxByType.clearButtonTitle': __('Clear'), + 'ClearIconButton.title': __('Clear'), + }, +}); diff --git a/app/assets/javascripts/commons/index.js b/app/assets/javascripts/commons/index.js index 77c85d85e27..d2a5ef83faf 100644 --- a/app/assets/javascripts/commons/index.js +++ b/app/assets/javascripts/commons/index.js @@ -1,6 +1,7 @@ import './polyfills'; import './bootstrap'; import './vue'; +import './gitlab_ui'; import '../lib/utils/axios_utils'; import { openUserCountsBroadcast } from './nav/user_merge_requests'; |