diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-09-28 11:03:26 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-09-28 11:03:26 +0300 |
| commit | bfa94a5fa2542f8822c8aba83b2b903fcced0ba4 (patch) | |
| tree | 53914bbf3317d58af4d0278791b101a7794a61dc /app | |
| parent | 2b6816a07b87c664620b7f747ee60aae0ff99715 (diff) | |
| parent | 74523de7f33fa0b92cb841812fc85808f41df0f0 (diff) | |
Merge branch 'fix_css-badge-class' into 'master'
Change class .label to .badge for 2FA label in group members view
See merge request gitlab-org/gitlab-ce!21759
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/shared/members/_member.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/shared/members/_member.html.haml b/app/views/shared/members/_member.html.haml index af29c0fe59e..2682d92fc56 100644 --- a/app/views/shared/members/_member.html.haml +++ b/app/views/shared/members/_member.html.haml @@ -22,7 +22,7 @@ %strong Blocked - if user.two_factor_enabled? - %label.label.label-info + %label.badge.badge-info 2FA - if source.instance_of?(Group) && source != @group |