Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-10-15 09:09:14 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-10-15 09:09:14 +0300
commit2819fd258a456f0193a2e1ca9e7a54cee45b98cf (patch)
tree0b96dc430b53a943937617888cf56874069ccde0 /app/assets/javascripts/repository
parent5ec2d1e9474e86064d5764bc991252dd1a370895 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/repository')
-rw-r--r--app/assets/javascripts/repository/index.js32
1 files changed, 4 insertions, 28 deletions
diff --git a/app/assets/javascripts/repository/index.js b/app/assets/javascripts/repository/index.js
index 0e4d724e949..a62b2d96c54 100644
--- a/app/assets/javascripts/repository/index.js
+++ b/app/assets/javascripts/repository/index.js
@@ -1,17 +1,17 @@
import Vue from 'vue';
import PathLastCommitQuery from 'shared_queries/repository/path_last_commit.query.graphql';
-import { escapeFileUrl, joinPaths, webIDEUrl } from '../lib/utils/url_utility';
+import { escapeFileUrl } from '../lib/utils/url_utility';
import createRouter from './router';
import App from './components/app.vue';
import Breadcrumbs from './components/breadcrumbs.vue';
import LastCommit from './components/last_commit.vue';
import TreeActionLink from './components/tree_action_link.vue';
-import WebIdeLink from '~/vue_shared/components/web_ide_link.vue';
+import initWebIdeLink from '~/pages/projects/shared/web_ide_link';
import DirectoryDownloadLinks from './components/directory_download_links.vue';
import apolloProvider from './graphql';
import { setTitle } from './utils/title';
import { updateFormAction } from './utils/dom';
-import { convertObjectPropsToCamelCase, parseBoolean } from '../lib/utils/common_utils';
+import { parseBoolean } from '../lib/utils/common_utils';
import { __ } from '../locale';
export default function setupVueRepositoryList() {
@@ -138,31 +138,7 @@ export default function setupVueRepositoryList() {
},
});
- const webIdeLinkEl = document.getElementById('js-tree-web-ide-link');
-
- if (webIdeLinkEl) {
- const {
- webIdeUrlData: { path: ideBasePath, isFork: webIdeIsFork },
- ...options
- } = convertObjectPropsToCamelCase(JSON.parse(webIdeLinkEl.dataset.options), { deep: true });
-
- // eslint-disable-next-line no-new
- new Vue({
- el: webIdeLinkEl,
- router,
- render(h) {
- return h(WebIdeLink, {
- props: {
- webIdeUrl: webIDEUrl(
- joinPaths('/', ideBasePath, 'edit', ref, '-', this.$route.params.path || '', '/'),
- ),
- webIdeIsFork,
- ...options,
- },
- });
- },
- });
- }
+ initWebIdeLink({ el: document.getElementById('js-tree-web-ide-link'), router });
const directoryDownloadLinks = document.getElementById('js-directory-downloads');