Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
148c1648
Commit
148c1648
authored
Apr 06, 2021
by
Yogi
Committed by
Vitaly Slobodin
Apr 06, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add gl-badge for badges in group members page
parent
17c4304e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
4 deletions
+9
-4
app/views/groups/group_members/index.html.haml
app/views/groups/group_members/index.html.haml
+4
-4
changelogs/unreleased/gl-badge-members.yml
changelogs/unreleased/gl-badge-members.yml
+5
-0
No files found.
app/views/groups/group_members/index.html.haml
View file @
148c1648
...
@@ -41,25 +41,25 @@
...
@@ -41,25 +41,25 @@
=
link_to
'#tab-members'
,
class:
[
'nav-link'
,
(
'active'
unless
invited_active
)],
data:
{
toggle:
'tab'
}
do
=
link_to
'#tab-members'
,
class:
[
'nav-link'
,
(
'active'
unless
invited_active
)],
data:
{
toggle:
'tab'
}
do
%span
%span
=
_
(
'Members'
)
=
_
(
'Members'
)
%span
.badge.
badge-pill
=
@members
.
total_count
%span
.badge.
gl-tab-counter-badge.badge-muted.badge-pill.gl-badge.sm
=
@members
.
total_count
-
if
@group
.
shared_with_group_links
.
any?
-
if
@group
.
shared_with_group_links
.
any?
%li
.nav-item
%li
.nav-item
=
link_to
'#tab-groups'
,
class:
[
'nav-link'
]
,
data:
{
toggle:
'tab'
,
qa_selector:
'groups_list_tab'
}
do
=
link_to
'#tab-groups'
,
class:
[
'nav-link'
]
,
data:
{
toggle:
'tab'
,
qa_selector:
'groups_list_tab'
}
do
%span
%span
=
_
(
'Groups'
)
=
_
(
'Groups'
)
%span
.badge.
badge-pill
=
@group
.
shared_with_group_links
.
count
%span
.badge.
gl-tab-counter-badge.badge-muted.badge-pill.gl-badge.sm
=
@group
.
shared_with_group_links
.
count
-
if
show_invited_members
-
if
show_invited_members
%li
.nav-item
%li
.nav-item
=
link_to
'#tab-invited-members'
,
class:
[
'nav-link'
,
(
'active'
if
invited_active
)],
data:
{
toggle:
'tab'
}
do
=
link_to
'#tab-invited-members'
,
class:
[
'nav-link'
,
(
'active'
if
invited_active
)],
data:
{
toggle:
'tab'
}
do
%span
%span
=
_
(
'Invited'
)
=
_
(
'Invited'
)
%span
.badge.
badge-pill
=
@invited_members
.
total_count
%span
.badge.
gl-tab-counter-badge.badge-muted.badge-pill.gl-badge.sm
=
@invited_members
.
total_count
-
if
show_access_requests
-
if
show_access_requests
%li
.nav-item
%li
.nav-item
=
link_to
'#tab-access-requests'
,
class:
'nav-link'
,
data:
{
toggle:
'tab'
}
do
=
link_to
'#tab-access-requests'
,
class:
'nav-link'
,
data:
{
toggle:
'tab'
}
do
%span
%span
=
_
(
'Access requests'
)
=
_
(
'Access requests'
)
%span
.badge.
badge-pill
=
@requesters
.
count
%span
.badge.
gl-tab-counter-badge.badge-muted.badge-pill.gl-badge.sm
=
@requesters
.
count
.tab-content
.tab-content
#tab-members
.tab-pane
{
class:
(
'active'
unless
invited_active
)
}
#tab-members
.tab-pane
{
class:
(
'active'
unless
invited_active
)
}
.js-group-members-list
{
data:
group_members_list_data_attributes
(
@group
,
@members
)
}
.js-group-members-list
{
data:
group_members_list_data_attributes
(
@group
,
@members
)
}
...
...
changelogs/unreleased/gl-badge-members.yml
0 → 100644
View file @
148c1648
---
title
:
Add gl-badge for badges in group members page
merge_request
:
57933
author
:
Yogi (@yo)
type
:
changed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment