Add latest changes from gitlab-org/gitlab@master

2 files changed, 40 insertions, 0 deletions

diff --git a/app/assets/javascripts/header_search/components/app.vue b/app/assets/javascripts/header_search/components/app.vue
new file mode 100644
index 00000000000..0c4df9cf522
--- /dev/null
+++ b/app/assets/javascripts/header_search/components/app.vue
@@ -0,0 +1,20 @@
+<script>
+import { GlSearchBoxByType } from '@gitlab/ui';
+import { __ } from '~/locale';
+
+export default {
+  name: 'HeaderSearchApp',
+  i18n: {
+    searchPlaceholder: __('Search or jump to...'),
+  },
+  components: {
+    GlSearchBoxByType,
+  },
+};
+</script>
+
+<template>
+  <section class="header-search">
+    <gl-search-box-by-type autocomplete="off" :placeholder="$options.i18n.searchPlaceholder" />
+  </section>
+</template>
diff --git a/app/assets/javascripts/header_search/index.js b/app/assets/javascripts/header_search/index.js
new file mode 100644
index 00000000000..fa1ac71655c
--- /dev/null
+++ b/app/assets/javascripts/header_search/index.js
@@ -0,0 +1,20 @@
+import Vue from 'vue';
+import Translate from '~/vue_shared/translate';
+import HeaderSearchApp from './components/app.vue';
+
+Vue.use(Translate);
+
+export const initHeaderSearchApp = () => {
+  const el = document.getElementById('js-header-search');
+
+  if (!el) {
+    return false;
+  }
+
+  return new Vue({
+    el,
+    render(createElement) {
+      return createElement(HeaderSearchApp);
+    },
+  });
+};