summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2019-04-15 21:54:14 +0000
committerFatih Acet <acetfatih@gmail.com>2019-04-15 21:54:14 +0000
commit8c10e99de29f3c6f0d17ebde5af14324956dc109 (patch)
treef8d693312164a36ff8733303b253effd8820ff52
parent65b38bf542c64d4ae19688fe4fdffa1060a1153a (diff)
parent1d2f3159cc71512a4fcd67e33523816ed2b2eaca (diff)
downloadgitlab-ce-8c10e99de29f3c6f0d17ebde5af14324956dc109.tar.gz
Merge branch '60026-group-member-count-bg' into 'master'
Add badge-pill class on group member count Closes #60026 See merge request gitlab-org/gitlab-ce!27019
-rw-r--r--app/views/groups/group_members/index.html.haml2
-rw-r--r--changelogs/unreleased/60026-group-member-count-bg.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/groups/group_members/index.html.haml b/app/views/groups/group_members/index.html.haml
index 2af3e861587..09cc713e3af 100644
--- a/app/views/groups/group_members/index.html.haml
+++ b/app/views/groups/group_members/index.html.haml
@@ -22,7 +22,7 @@
%span.flex-project-title
Members with access to
%strong= @group.name
- %span.badge= @members.total_count
+ %span.badge.badge-pill= @members.total_count
= form_tag group_group_members_path(@group), method: :get, class: 'form-inline member-search-form flex-project-members-form' do
.form-group
.position-relative.append-right-8
diff --git a/changelogs/unreleased/60026-group-member-count-bg.yml b/changelogs/unreleased/60026-group-member-count-bg.yml
new file mode 100644
index 00000000000..0a1f6eac2ea
--- /dev/null
+++ b/changelogs/unreleased/60026-group-member-count-bg.yml
@@ -0,0 +1,5 @@
+---
+title: Add badge-pill class on group member count
+merge_request: 27019
+author:
+type: fixed