diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-27 12:08:35 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-27 12:08:35 +0000 |
commit | 22e9af3c8b8aedf7f46b786be968862b74a2d07e (patch) | |
tree | a10a7d9af40a17fe6cda7b3a681f5e5e2112c16e /app | |
parent | c8e28a0bb8dd45d91cb72ff2c930bc4a562f1fc7 (diff) | |
download | gitlab-ce-22e9af3c8b8aedf7f46b786be968862b74a2d07e.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/filtered_search/dropdown_operator.js | 4 | ||||
-rw-r--r-- | app/assets/javascripts/ide/services/index.js | 3 | ||||
-rw-r--r-- | app/assets/javascripts/repository/components/breadcrumbs.vue | 4 | ||||
-rw-r--r-- | app/assets/javascripts/repository/components/table/parent_row.vue | 2 | ||||
-rw-r--r-- | app/assets/javascripts/repository/components/table/row.vue | 2 | ||||
-rw-r--r-- | app/assets/javascripts/repository/router.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/vue_shared/components/diff_viewer/diff_viewer.vue | 4 | ||||
-rw-r--r-- | app/assets/javascripts/vue_shared/components/pagination/graphql_pagination.vue | 47 | ||||
-rw-r--r-- | app/helpers/submodule_helper.rb | 13 | ||||
-rw-r--r-- | app/helpers/tree_helper.rb | 4 | ||||
-rw-r--r-- | app/models/key.rb | 3 | ||||
-rw-r--r-- | app/models/repository.rb | 2 |
12 files changed, 25 insertions, 65 deletions
diff --git a/app/assets/javascripts/filtered_search/dropdown_operator.js b/app/assets/javascripts/filtered_search/dropdown_operator.js index bd4fda29609..d9794e326f8 100644 --- a/app/assets/javascripts/filtered_search/dropdown_operator.js +++ b/app/assets/javascripts/filtered_search/dropdown_operator.js @@ -45,13 +45,13 @@ export default class DropdownOperator extends FilteredSearchDropdown { tag: 'equal', type: 'string', title: '=', - help: __('Is'), + help: __('is'), }, { tag: 'not-equal', type: 'string', title: '!=', - help: __('Is not'), + help: __('is not'), }, ]; this.droplab.changeHookList(this.hookId, this.dropdown, [Filter], this.config); diff --git a/app/assets/javascripts/ide/services/index.js b/app/assets/javascripts/ide/services/index.js index b130e6e8b81..a5134c64705 100644 --- a/app/assets/javascripts/ide/services/index.js +++ b/app/assets/javascripts/ide/services/index.js @@ -35,6 +35,7 @@ export default { joinPaths( gon.relative_url_root || '/', file.projectId, + '-', 'raw', sha, escapeFileUrl(filePath), @@ -67,7 +68,7 @@ export default { return Api.commitMultiple(projectId, payload); }, getFiles(projectUrl, ref) { - const url = `${projectUrl}/files/${ref}`; + const url = `${projectUrl}/-/files/${ref}`; return axios.get(url, { params: { format: 'json' } }); }, lastCommitPipelines({ getters }) { diff --git a/app/assets/javascripts/repository/components/breadcrumbs.vue b/app/assets/javascripts/repository/components/breadcrumbs.vue index 5917c96990e..f306910df05 100644 --- a/app/assets/javascripts/repository/components/breadcrumbs.vue +++ b/app/assets/javascripts/repository/components/breadcrumbs.vue @@ -107,10 +107,10 @@ export default { return acc.concat({ name, path, - to: `/tree/${this.ref}${path}`, + to: `/-/tree/${this.ref}${path}`, }); }, - [{ name: this.projectShortPath, path: '/', to: `/tree/${this.ref}/` }], + [{ name: this.projectShortPath, path: '/', to: `/-/tree/${this.ref}/` }], ); }, canCreateMrFromFork() { diff --git a/app/assets/javascripts/repository/components/table/parent_row.vue b/app/assets/javascripts/repository/components/table/parent_row.vue index 70a188f98cc..c919f2d42cb 100644 --- a/app/assets/javascripts/repository/components/table/parent_row.vue +++ b/app/assets/javascripts/repository/components/table/parent_row.vue @@ -28,7 +28,7 @@ export default { return splitArray.join('/'); }, parentRoute() { - return { path: `/tree/${this.commitRef}/${this.parentPath}` }; + return { path: `/-/tree/${this.commitRef}/${this.parentPath}` }; }, }, methods: { diff --git a/app/assets/javascripts/repository/components/table/row.vue b/app/assets/javascripts/repository/components/table/row.vue index a8e13241c37..a0a9a5657a8 100644 --- a/app/assets/javascripts/repository/components/table/row.vue +++ b/app/assets/javascripts/repository/components/table/row.vue @@ -90,7 +90,7 @@ export default { }, computed: { routerLinkTo() { - return this.isFolder ? { path: `/tree/${this.ref}/${this.path}` } : null; + return this.isFolder ? { path: `/-/tree/${this.ref}/${this.path}` } : null; }, iconName() { return `fa-${getIconName(this.type, this.path)}`; diff --git a/app/assets/javascripts/repository/router.js b/app/assets/javascripts/repository/router.js index ebf0a7091ea..fa544444be8 100644 --- a/app/assets/javascripts/repository/router.js +++ b/app/assets/javascripts/repository/router.js @@ -12,7 +12,7 @@ export default function createRouter(base, baseRef) { base: joinPaths(gon.relative_url_root || '', base), routes: [ { - path: `/tree/${baseRef}(/.*)?`, + path: `/-/tree/${baseRef}(/.*)?`, name: 'treePath', component: TreePage, props: route => ({ diff --git a/app/assets/javascripts/vue_shared/components/diff_viewer/diff_viewer.vue b/app/assets/javascripts/vue_shared/components/diff_viewer/diff_viewer.vue index b874bedab36..bf3c3666300 100644 --- a/app/assets/javascripts/vue_shared/components/diff_viewer/diff_viewer.vue +++ b/app/assets/javascripts/vue_shared/components/diff_viewer/diff_viewer.vue @@ -79,10 +79,10 @@ export default { return this.projectPath.indexOf('/') === 0 ? '' : `${gon.relative_url_root}/`; }, fullOldPath() { - return `${this.basePath}${this.projectPath}/raw/${this.oldSha}/${this.oldPath}`; + return `${this.basePath}${this.projectPath}/-/raw/${this.oldSha}/${this.oldPath}`; }, fullNewPath() { - return `${this.basePath}${this.projectPath}/raw/${this.newSha}/${this.newPath}`; + return `${this.basePath}${this.projectPath}/-/raw/${this.newSha}/${this.newPath}`; }, }, }; diff --git a/app/assets/javascripts/vue_shared/components/pagination/graphql_pagination.vue b/app/assets/javascripts/vue_shared/components/pagination/graphql_pagination.vue deleted file mode 100644 index 53e473432db..00000000000 --- a/app/assets/javascripts/vue_shared/components/pagination/graphql_pagination.vue +++ /dev/null @@ -1,47 +0,0 @@ -<script> -import { GlButton } from '@gitlab/ui'; -import { PREV, NEXT } from '~/vue_shared/components/pagination/constants'; - -/** - * Pagination Component for graphql API - */ -export default { - name: 'GraphqlPaginationComponent', - components: { - GlButton, - }, - labels: { - prev: PREV, - next: NEXT, - }, - props: { - hasNextPage: { - required: true, - type: Boolean, - }, - hasPreviousPage: { - required: true, - type: Boolean, - }, - }, -}; -</script> -<template> - <div class="justify-content-center d-flex prepend-top-default"> - <div class="btn-group"> - <gl-button - class="js-prev-btn page-link" - :disabled="!hasPreviousPage" - @click="$emit('previousClicked')" - >{{ $options.labels.prev }}</gl-button - > - - <gl-button - class="js-next-btn page-link" - :disabled="!hasNextPage" - @click="$emit('nextClicked')" - >{{ $options.labels.next }}</gl-button - > - </div> - </div> -</template> diff --git a/app/helpers/submodule_helper.rb b/app/helpers/submodule_helper.rb index 9707a5cef3b..32c613ab4ad 100644 --- a/app/helpers/submodule_helper.rb +++ b/app/helpers/submodule_helper.rb @@ -39,9 +39,9 @@ module SubmoduleHelper elsif relative_self_url?(url) relative_self_links(url, submodule_item_id, repository.project) elsif github_dot_com_url?(url) - standard_links('github.com', namespace, project, submodule_item_id) + github_com_tree_links(namespace, project, submodule_item_id) elsif gitlab_dot_com_url?(url) - standard_links('gitlab.com', namespace, project, submodule_item_id) + gitlab_com_tree_links(namespace, project, submodule_item_id) else [sanitize_submodule_url(url), nil] end @@ -73,8 +73,13 @@ module SubmoduleHelper url.start_with?('../', './') end - def standard_links(host, namespace, project, commit) - base = ['https://', host, '/', namespace, '/', project].join('') + def gitlab_com_tree_links(namespace, project, commit) + base = ['https://gitlab.com/', namespace, '/', project].join('') + [base, [base, '/-/tree/', commit].join('')] + end + + def github_com_tree_links(namespace, project, commit) + base = ['https://github.com/', namespace, '/', project].join('') [base, [base, '/tree/', commit].join('')] end diff --git a/app/helpers/tree_helper.rb b/app/helpers/tree_helper.rb index af1919eeb40..0b50b8b1130 100644 --- a/app/helpers/tree_helper.rb +++ b/app/helpers/tree_helper.rb @@ -38,13 +38,13 @@ module TreeHelper # many paths, as with a repository tree that has thousands of items. def fast_project_blob_path(project, blob_path) ActionDispatch::Journey::Router::Utils.escape_path( - File.join(relative_url_root, project.path_with_namespace, 'blob', blob_path) + File.join(relative_url_root, project.path_with_namespace, '-', 'blob', blob_path) ) end def fast_project_tree_path(project, tree_path) ActionDispatch::Journey::Router::Utils.escape_path( - File.join(relative_url_root, project.path_with_namespace, 'tree', tree_path) + File.join(relative_url_root, project.path_with_namespace, '-', 'tree', tree_path) ) end diff --git a/app/models/key.rb b/app/models/key.rb index 71188f210bb..e729ef67346 100644 --- a/app/models/key.rb +++ b/app/models/key.rb @@ -96,8 +96,7 @@ class Key < ApplicationRecord def remove_from_shell GitlabShellWorker.perform_async( :remove_key, - shell_id, - key + shell_id ) end diff --git a/app/models/repository.rb b/app/models/repository.rb index ebb653cabce..ba0b87b7429 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -447,6 +447,8 @@ class Repository def after_import expire_content_cache + return unless repo_type.project? + # This call is stubbed in tests due to being an expensive operation # It can be reenabled for specific tests via: # |