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

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