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
ca6aef01
Commit
ca6aef01
authored
Jan 15, 2021
by
Yogi
Committed by
David O'Regan
Jan 15, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add gl-badge to members list badges
parent
41da94da
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
app/views/shared/members/_badge.html.haml
app/views/shared/members/_badge.html.haml
+1
-1
changelogs/unreleased/yo-gl-badge.yml
changelogs/unreleased/yo-gl-badge.yml
+5
-0
ee/app/views/shared/members/ee/_license_badge.html.haml
ee/app/views/shared/members/ee/_license_badge.html.haml
+1
-1
No files found.
app/views/shared/members/_badge.html.haml
View file @
ca6aef01
-
type
||=
'info'
-
type
||=
'info'
%span
.px-1.py-1
%span
.px-1.py-1
%span
{
class:
"badge badge-#{type}"
}=
yield
%span
{
class:
"badge badge-
pill gl-badge sm badge-
#{type}"
}=
yield
changelogs/unreleased/yo-gl-badge.yml
0 → 100644
View file @
ca6aef01
---
title
:
Add gl-badge to members list badges
merge_request
:
51546
author
:
Yogi (@yo)
type
:
other
ee/app/views/shared/members/ee/_license_badge.html.haml
View file @
ca6aef01
-
if
group
.
present?
&&
current_user_is_group_owner
&&
user
.
using_gitlab_com_seat?
(
group
)
-
if
group
.
present?
&&
current_user_is_group_owner
&&
user
.
using_gitlab_com_seat?
(
group
)
=
render
'shared/members/badge'
,
type:
'
light
'
do
=
render
'shared/members/badge'
,
type:
'
neutral
'
do
=
_
(
"Is using seat"
)
=
_
(
"Is using seat"
)
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