Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2018-04-09 20:05:46 +0300
committerClement Ho <ClemMakesApps@gmail.com>2018-04-09 20:05:46 +0300
commit66d3894d53995b01e5a6c0686ca9b787a7bec1c7 (patch)
tree85e6b91577e3b2f6494719db05909cdbf1f3ad75 /app/helpers/issuables_helper.rb
parentaa4942a2132652ccca52a583c78f7aa92ff7d256 (diff)
Fix bad merge conflict
Diffstat (limited to 'app/helpers/issuables_helper.rb')
-rw-r--r--app/helpers/issuables_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb
index 06c3e569c84..1ece87fbe57 100644
--- a/app/helpers/issuables_helper.rb
+++ b/app/helpers/issuables_helper.rb
@@ -169,7 +169,7 @@ module IssuablesHelper
if display_count
count = issuables_count_for_state(issuable_type, state)
- html << " " << content_tag(:span, number_with_delimiter(count), class: 'badge')
+ html << " " << content_tag(:span, number_with_delimiter(count), class: 'badge badge-pill')
end
html.html_safe