Commit 23d40ead authored by Andrew Fontaine's avatar Andrew Fontaine

Merge branch '219860-aqualls-fix-button' into 'master'

Strip deprecations from last_commit.vue

Closes #219860

See merge request gitlab-org/gitlab!43337
parents f93650ad a2fd7a5d
<script> <script>
/* eslint-disable vue/no-v-html */ /* eslint-disable vue/no-v-html */
import { GlTooltipDirective, GlLink, GlDeprecatedButton, GlLoadingIcon, GlIcon } from '@gitlab/ui'; import { GlTooltipDirective, GlLink, GlButton, GlLoadingIcon } from '@gitlab/ui';
import defaultAvatarUrl from 'images/no_avatar.png'; import defaultAvatarUrl from 'images/no_avatar.png';
import { sprintf, s__ } from '~/locale'; import { sprintf, s__ } from '~/locale';
import UserAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue'; import UserAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue';
...@@ -13,13 +13,12 @@ import pathLastCommitQuery from '../queries/path_last_commit.query.graphql'; ...@@ -13,13 +13,12 @@ import pathLastCommitQuery from '../queries/path_last_commit.query.graphql';
export default { export default {
components: { components: {
GlIcon,
UserAvatarLink, UserAvatarLink,
TimeagoTooltip, TimeagoTooltip,
ClipboardButton, ClipboardButton,
CiIcon, CiIcon,
GlLink, GlLink,
GlDeprecatedButton, GlButton,
GlLoadingIcon, GlLoadingIcon,
}, },
directives: { directives: {
...@@ -123,15 +122,14 @@ export default { ...@@ -123,15 +122,14 @@ export default {
class="commit-row-message item-title" class="commit-row-message item-title"
v-html="commit.titleHtml" v-html="commit.titleHtml"
/> />
<gl-deprecated-button <gl-button
v-if="commit.descriptionHtml" v-if="commit.descriptionHtml"
:class="{ open: showDescription }" :class="{ open: showDescription }"
:aria-label="__('Show commit description')" :aria-label="__('Show commit description')"
class="text-expander" class="text-expander gl-vertical-align-bottom!"
icon="ellipsis_h"
@click="toggleShowDescription" @click="toggleShowDescription"
> />
<gl-icon name="ellipsis_h" :size="10" />
</gl-deprecated-button>
<div class="committer"> <div class="committer">
<gl-link <gl-link
v-if="commit.author" v-if="commit.author"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment