summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2016-03-24 14:33:00 +0000
committerRémy Coutable <remy@rymai.me>2016-03-29 12:13:46 +0200
commit062b806df0ae7eaece4134f6f77c19a3fd9f2f4c (patch)
treea9100d03f690a676a4cc40676441af676f0c8df7
parent9612e5759305985cefe4d99941398dea51f9ce02 (diff)
downloadgitlab-ce-062b806df0ae7eaece4134f6f77c19a3fd9f2f4c.tar.gz
Merge branch 'sidebar-bold-fix' into 'master'
Fixed bold in sidebar ![Screen_Shot_2016-03-23_at_12.01.54](/uploads/d50ae3426efcb2436b3debdd80073b2f/Screen_Shot_2016-03-23_at_12.01.54.png) This is to go with https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/289 See merge request !3358
-rw-r--r--CHANGELOG1
-rw-r--r--app/views/shared/issuable/_sidebar.html.haml2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 622e9c64944..29ce82f1c74 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@ v 8.6.2
- Fix dropdown alignment. !3298
- Fix issuable sidebar overlaps on tablet. !3299
- Make dropdowns pixel perfect. !3337
+ - Fix bold text in issuable sidebar. !3358
v 8.6.1
- Add option to reload the schema before restoring a database backup. !2807
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml
index 5b2772de3f1..0e20e86356d 100644
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -77,7 +77,7 @@
Labels
- if can?(current_user, :"admin_#{issuable.to_ability_name}", @project)
= link_to 'Edit', '#', class: 'edit-link pull-right'
- .value.issuable-show-labels.hide-collapsed{class: ("has-labels" if issuable.labels.any?)}
+ .value.bold.issuable-show-labels.hide-collapsed{ class: ("has-labels" if issuable.labels.any?) }
- if issuable.labels.any?
- issuable.labels.each do |label|
= link_to_label(label, type: issuable.to_ability_name)