summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/diffs/components/commit_item.vue
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-08-28 09:10:32 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-08-28 09:10:32 +0000
commitc4b69460e8dd4921eb20fa78b47ceff294d725dc (patch)
tree9be3f5c3913ead9eeb5f183ac7a163b193412967 /app/assets/javascripts/diffs/components/commit_item.vue
parent540c69c58c9e60f2d9b47987afe5e020593d39ac (diff)
downloadgitlab-ce-c4b69460e8dd4921eb20fa78b47ceff294d725dc.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/diffs/components/commit_item.vue')
-rw-r--r--app/assets/javascripts/diffs/components/commit_item.vue11
1 files changed, 5 insertions, 6 deletions
diff --git a/app/assets/javascripts/diffs/components/commit_item.vue b/app/assets/javascripts/diffs/components/commit_item.vue
index 72cb4594359..23669eecce2 100644
--- a/app/assets/javascripts/diffs/components/commit_item.vue
+++ b/app/assets/javascripts/diffs/components/commit_item.vue
@@ -149,14 +149,13 @@ export default {
<span class="commit-row-message d-block d-sm-none">&middot; {{ commit.short_id }}</span>
- <button
+ <gl-button
v-if="commit.description_html && collapsible"
- class="text-expander js-toggle-button"
- type="button"
+ class="js-toggle-button"
+ size="small"
+ icon="ellipsis_h"
:aria-label="__('Toggle commit description')"
- >
- <gl-icon :size="12" name="ellipsis_h" />
- </button>
+ />
<div class="committer">
<a