Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 10 deletions

diff --git a/app/assets/javascripts/repository/index.js b/app/assets/javascripts/repository/index.js
index fafc6e8eb89..747b85f5c1c 100644
--- a/app/assets/javascripts/repository/index.js
+++ b/app/assets/javascripts/repository/index.js
@@ -1,8 +1,8 @@
 import Vue from 'vue';
-import { parseBoolean } from '~/lib/utils/common_utils';
-import { escapeFileUrl } from '~/lib/utils/url_utility';
-import { __ } from '~/locale';
 import initWebIdeLink from '~/pages/projects/shared/web_ide_link';
+import { parseBoolean } from '../lib/utils/common_utils';
+import { escapeFileUrl } from '../lib/utils/url_utility';
+import { __ } from '../locale';
 import App from './components/app.vue';
 import Breadcrumbs from './components/breadcrumbs.vue';
 import DirectoryDownloadLinks from './components/directory_download_links.vue';
@@ -55,8 +55,6 @@ export default function setupVueRepositoryList() {
     const {
       canCollaborate,
       canEditTree,
-      canPushCode,
-      selectedBranch,
       newBranchPath,
       newTagPath,
       newBlobPath,
@@ -67,7 +65,8 @@ export default function setupVueRepositoryList() {
       newDirPath,
     } = breadcrumbEl.dataset;
 
-    router.afterEach(({ params: { path } }) => {
+    router.afterEach(({ params: { path = '/' } }) => {
+      updateFormAction('.js-upload-blob-form', uploadPath, path);
       updateFormAction('.js-create-dir-form', newDirPath, path);
     });
 
@@ -82,16 +81,12 @@ export default function setupVueRepositoryList() {
             currentPath: this.$route.params.path,
             canCollaborate: parseBoolean(canCollaborate),
             canEditTree: parseBoolean(canEditTree),
-            canPushCode: parseBoolean(canPushCode),
-            origionalBranch: ref,
-            selectedBranch,
             newBranchPath,
             newTagPath,
             newBlobPath,
             forkNewBlobPath,
             forkNewDirectoryPath,
             forkUploadBlobPath,
-            uploadPath,
           },
         });
       },