Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42

1 files changed, 6 insertions, 1 deletions

diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index c64c2ab35fb..1247f9ae260 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -101,6 +101,7 @@ module UsersHelper
       badges << { text: s_('AdminUsers|Admin'), variant: 'success' } if user.admin?
       badges << { text: s_('AdminUsers|External'), variant: 'secondary' } if user.external?
       badges << { text: s_("AdminUsers|It's you!"), variant: 'muted' } if current_user == user
+      badges << { text: s_("AdminUsers|Locked"), variant: 'warning' } if user.access_locked?
     end
   end
 
@@ -124,7 +125,7 @@ module UsersHelper
   end
 
   def ban_feature_available?
-    Feature.enabled?(:ban_user_feature_flag)
+    Feature.enabled?(:ban_user_feature_flag, default_enabled: :yaml)
   end
 
   def confirm_user_data(user)
@@ -171,6 +172,10 @@ module UsersHelper
     }
   end
 
+  def display_public_email?(user)
+    user.public_email.present?
+  end
+
   private
 
   def admin_users_paths