diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-27 15:08:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-27 15:08:35 +0300 |
commit | 22e9af3c8b8aedf7f46b786be968862b74a2d07e (patch) | |
tree | a10a7d9af40a17fe6cda7b3a681f5e5e2112c16e /app/assets/javascripts/vue_shared/components | |
parent | c8e28a0bb8dd45d91cb72ff2c930bc4a562f1fc7 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared/components')
-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 |
2 files changed, 2 insertions, 49 deletions
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> |