diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 09:09:31 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 09:09:31 +0000 |
commit | 04baa85554ff13bdd4d6f4e6bb24119d17608fee (patch) | |
tree | 7cb9c0977e09d97da340f48703d79b2dbd3579a0 /app/assets/javascripts/diffs/components/compare_versions.vue | |
parent | 42f41de46525ce0065f02ee07c1a79f5669526a0 (diff) | |
download | gitlab-ce-04baa85554ff13bdd4d6f4e6bb24119d17608fee.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/diffs/components/compare_versions.vue')
-rw-r--r-- | app/assets/javascripts/diffs/components/compare_versions.vue | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/app/assets/javascripts/diffs/components/compare_versions.vue b/app/assets/javascripts/diffs/components/compare_versions.vue index 3a2146147cc..34716c214c6 100644 --- a/app/assets/javascripts/diffs/components/compare_versions.vue +++ b/app/assets/javascripts/diffs/components/compare_versions.vue @@ -1,6 +1,6 @@ <script> import { mapActions, mapGetters, mapState } from 'vuex'; -import { GlTooltipDirective, GlLink, GlButton, GlSprintf } from '@gitlab/ui'; +import { GlTooltipDirective, GlLink, GlDeprecatedButton, GlSprintf } from '@gitlab/ui'; import { __ } from '~/locale'; import { polyfillSticky } from '~/lib/utils/sticky'; import Icon from '~/vue_shared/components/icon.vue'; @@ -14,7 +14,7 @@ export default { CompareVersionsDropdown, Icon, GlLink, - GlButton, + GlDeprecatedButton, GlSprintf, SettingsDropdown, DiffStats, @@ -140,16 +140,20 @@ export default { :added-lines="addedLines" :removed-lines="removedLines" /> - <gl-button + <gl-deprecated-button v-if="commit || startVersion" :href="latestVersionPath" class="append-right-8 js-latest-version" > {{ __('Show latest version') }} - </gl-button> - <gl-button v-show="hasCollapsedFile" class="append-right-8" @click="expandAllFiles"> + </gl-deprecated-button> + <gl-deprecated-button + v-show="hasCollapsedFile" + class="append-right-8" + @click="expandAllFiles" + > {{ __('Expand all') }} - </gl-button> + </gl-deprecated-button> <settings-dropdown /> </div> </div> |