diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-23 18:06:14 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-23 18:06:14 +0000 |
commit | c792263edfaf826c58f4aa41d26904464a17a3e7 (patch) | |
tree | b57ae96c9eeaf0a1432a29f7f50f2fce9529818d /app/assets/javascripts/releases | |
parent | 6f9edd1a4c4942d3d13ec54793cfae56164b1a0a (diff) | |
download | gitlab-ce-c792263edfaf826c58f4aa41d26904464a17a3e7.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/releases')
-rw-r--r-- | app/assets/javascripts/releases/components/release_block.vue | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/app/assets/javascripts/releases/components/release_block.vue b/app/assets/javascripts/releases/components/release_block.vue index 2dacd8549ad..32bf05a7629 100644 --- a/app/assets/javascripts/releases/components/release_block.vue +++ b/app/assets/javascripts/releases/components/release_block.vue @@ -42,6 +42,12 @@ export default { commit() { return this.release.commit || {}; }, + commitUrl() { + return this.release.commit_path; + }, + tagUrl() { + return this.release.tag_path; + }, assets() { return this.release.assets || {}; }, @@ -81,12 +87,18 @@ export default { <div class="card-subtitle d-flex flex-wrap text-secondary"> <div class="append-right-8"> <icon name="commit" class="align-middle" /> - <span v-gl-tooltip.bottom :title="commit.title">{{ commit.short_id }}</span> + <gl-link v-if="commitUrl" v-gl-tooltip.bottom :title="commit.title" :href="commitUrl"> + {{ commit.short_id }} + </gl-link> + <span v-else v-gl-tooltip.bottom :title="commit.title">{{ commit.short_id }}</span> </div> <div class="append-right-8"> <icon name="tag" class="align-middle" /> - <span v-gl-tooltip.bottom :title="__('Tag')">{{ release.tag_name }}</span> + <gl-link v-if="tagUrl" v-gl-tooltip.bottom :title="__('Tag')" :href="tagUrl"> + {{ release.tag_name }} + </gl-link> + <span v-else v-gl-tooltip.bottom :title="__('Tag')">{{ release.tag_name }}</span> </div> <milestone-list |