Add latest changes from gitlab-org/gitlab@master

3 files changed, 10 insertions, 4 deletions

diff --git a/app/assets/javascripts/pages/projects/show/index.js b/app/assets/javascripts/pages/projects/show/index.js
index 6aa41d0825b..370f3c6e7a2 100644
--- a/app/assets/javascripts/pages/projects/show/index.js
+++ b/app/assets/javascripts/pages/projects/show/index.js
@@ -48,7 +48,7 @@ document.addEventListener('DOMContentLoaded', () => {
   leaveByUrl('project');
 
   if (document.getElementById('js-tree-list')) {
-    import('~/repository')
+    import('ee_else_ce/repository')
       .then(m => m.default())
       .catch(e => {
         throw e;
diff --git a/app/assets/javascripts/pages/projects/tree/show/index.js b/app/assets/javascripts/pages/projects/tree/show/index.js
index 7b90a3a4f6e..16d71379e31 100644
--- a/app/assets/javascripts/pages/projects/tree/show/index.js
+++ b/app/assets/javascripts/pages/projects/tree/show/index.js
@@ -42,7 +42,7 @@ document.addEventListener('DOMContentLoaded', () => {
   GpgBadges.fetch();
 
   if (document.getElementById('js-tree-list')) {
-    import('~/repository')
+    import('ee_else_ce/repository')
       .then(m => m.default())
       .catch(e => {
         throw e;
diff --git a/app/assets/javascripts/repository/index.js b/app/assets/javascripts/repository/index.js
index f9727960040..6a6e7f73188 100644
--- a/app/assets/javascripts/repository/index.js
+++ b/app/assets/javascripts/repository/index.js
@@ -9,8 +9,10 @@ import { parseBoolean } from '../lib/utils/common_utils';
 
 export default function setupVueRepositoryList() {
   const el = document.getElementById('js-tree-list');
-  const { projectPath, projectShortPath, ref, fullName } = el.dataset;
+  const { dataset } = el;
+  const { projectPath, projectShortPath, ref, fullName } = dataset;
   const router = createRouter(projectPath, ref);
+  const hideOnRootEls = document.querySelectorAll('.js-hide-on-root');
 
   apolloProvider.clients.defaultClient.cache.writeData({
     data: {
@@ -35,6 +37,7 @@ export default function setupVueRepositoryList() {
     document
       .querySelectorAll('.js-hide-on-navigation')
       .forEach(elem => elem.classList.toggle('hidden', !isRoot));
+    hideOnRootEls.forEach(elem => elem.classList.toggle('hidden', isRoot));
   });
 
   const breadcrumbEl = document.getElementById('js-repo-breadcrumb');
@@ -88,7 +91,8 @@ export default function setupVueRepositoryList() {
     },
   });
 
-  return new Vue({
+  // eslint-disable-next-line no-new
+  new Vue({
     el,
     router,
     apolloProvider,
@@ -96,4 +100,6 @@ export default function setupVueRepositoryList() {
       return h(App);
     },
   });
+
+  return { router, data: dataset };
 }