summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-11-23 12:16:33 +0000
committerPhil Hughes <me@iamphill.com>2018-11-23 12:16:33 +0000
commitac7d842c6810f7362fc86fd9aff2167724b22b7b (patch)
treeb9be39395cdef20f7c58a0e1237861ef03e53314
parentab0828cf0f70edb199d60576f7ba8f740040ff1e (diff)
parent1564c86adc5ed32d2813f414276b10a2350b48e0 (diff)
downloadgitlab-ce-ac7d842c6810f7362fc86fd9aff2167724b22b7b.tar.gz
Merge branch '54391-tag' into 'master'
Correctly styles tags in jobs sidebar Closes #54391 See merge request gitlab-org/gitlab-ce!23319
-rw-r--r--app/assets/javascripts/jobs/components/sidebar.vue2
-rw-r--r--changelogs/unreleased/54391-tag.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/jobs/components/sidebar.vue b/app/assets/javascripts/jobs/components/sidebar.vue
index 0f590e077bf..934ecd0e3ec 100644
--- a/app/assets/javascripts/jobs/components/sidebar.vue
+++ b/app/assets/javascripts/jobs/components/sidebar.vue
@@ -199,7 +199,7 @@ export default {
/>
<p v-if="job.tags.length" class="build-detail-row js-job-tags">
<span class="build-light-text"> {{ __('Tags:') }} </span>
- <span v-for="(tag, i) in job.tags" :key="i" class="label label-primary">
+ <span v-for="(tag, i) in job.tags" :key="i" class="badge badge-primary">
{{ tag }}
</span>
</p>
diff --git a/changelogs/unreleased/54391-tag.yml b/changelogs/unreleased/54391-tag.yml
new file mode 100644
index 00000000000..be571c6b0c3
--- /dev/null
+++ b/changelogs/unreleased/54391-tag.yml
@@ -0,0 +1,5 @@
+---
+title: Correctly styles tags in sidebar for job page
+merge_request:
+author:
+type: fixed