diff options
Diffstat (limited to 'app/assets')
8 files changed, 11 insertions, 57 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> |