Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 0 deletions

diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 1774e137f8f..08c88c39670 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -178,6 +178,15 @@ module UsersHelper
     header + list
   end
 
+  def user_display_name(user)
+    return s_('UserProfile|Blocked user') if user.blocked?
+
+    can_read_profile = can?(user, :read_user_profile, current_user)
+    return s_('UserProfile|Unconfirmed user') unless user.confirmed? || can_read_profile
+
+    user.name
+  end
+
   private
 
   def blocked_user_badge(user)