diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-20 12:16:11 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-20 12:16:11 +0300 |
| commit | edaa33dee2ff2f7ea3fac488d41558eb5f86d68c (patch) | |
| tree | 11f143effbfeba52329fb7afbd05e6e2a3790241 /app/views/shared/members | |
| parent | d8a5691316400a0f7ec4f83832698f1988eb27c1 (diff) | |
Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42
Diffstat (limited to 'app/views/shared/members')
4 files changed, 5 insertions, 5 deletions
diff --git a/app/views/shared/members/_badge.html.haml b/app/views/shared/members/_badge.html.haml index 5f925ff0cad..e7bd055fe5d 100644 --- a/app/views/shared/members/_badge.html.haml +++ b/app/views/shared/members/_badge.html.haml @@ -1,4 +1,4 @@ -- type ||= 'info' +- variant ||= :info %span.px-1.py-1 - %span{ class: "badge badge-pill gl-badge sm badge-#{type}" }= yield + = gl_badge_tag yield, variant: variant, size: :sm diff --git a/app/views/shared/members/_blocked_badge.html.haml b/app/views/shared/members/_blocked_badge.html.haml index 95335ebe74d..6795128279f 100644 --- a/app/views/shared/members/_blocked_badge.html.haml +++ b/app/views/shared/members/_blocked_badge.html.haml @@ -1,3 +1,3 @@ - if user.blocked? - = render 'shared/members/badge', type: 'danger' do + = render 'shared/members/badge', variant: :danger do = _("Blocked") diff --git a/app/views/shared/members/_its_you_badge.html.haml b/app/views/shared/members/_its_you_badge.html.haml index b53ffd8032d..4442e57f86e 100644 --- a/app/views/shared/members/_its_you_badge.html.haml +++ b/app/views/shared/members/_its_you_badge.html.haml @@ -1,3 +1,3 @@ - if user == current_user - = render 'shared/members/badge', type: 'success' do + = render 'shared/members/badge', variant: :success do = _("It's you") diff --git a/app/views/shared/members/_two_factor_auth_badge.html.haml b/app/views/shared/members/_two_factor_auth_badge.html.haml index 34850c135d6..f1cb7a5bd85 100644 --- a/app/views/shared/members/_two_factor_auth_badge.html.haml +++ b/app/views/shared/members/_two_factor_auth_badge.html.haml @@ -1,3 +1,3 @@ - if user.two_factor_enabled? - = render 'shared/members/badge', type: 'info' do + = render 'shared/members/badge', variant: :info do = _("2FA") |