Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 10 deletions

diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index b68c7472bd5..5bfdd174694 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -8,9 +8,7 @@ import './commons';
 import './behaviors';
 
 // lib/utils
-import applyGitLabUIConfig from '@gitlab/ui/dist/config';
 import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils';
-import { __ } from '~/locale';
 import { initRails } from '~/lib/utils/rails_ujs';
 import * as popovers from '~/popovers';
 import * as tooltips from '~/tooltips';
@@ -45,14 +43,6 @@ import 'jh_else_ce/main_jh';
 
 logHelloDeferred();
 
-applyGitLabUIConfig({
-  translations: {
-    'GlSearchBoxByType.input.placeholder': __('Search'),
-    'GlSearchBoxByType.clearButtonTitle': __('Clear'),
-    'ClearIconButton.title': __('Clear'),
-  },
-});
-
 // expose jQuery as global (TODO: remove these)
 window.jQuery = jQuery;
 window.$ = jQuery;