diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-01 18:09:42 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-01 18:09:42 +0000 |
| commit | 102255f6d4209b9ee54c6f36d9391aae0a4b0dfb (patch) | |
| tree | 12f8bdb3ce84444f0948b1d00f49457975a129b5 /app/helpers/users_helper.rb | |
| parent | 893ba862a7808ac7099c0d5c6d6ad618ae4e2665 (diff) | |
| download | gitlab-ce-102255f6d4209b9ee54c6f36d9391aae0a4b0dfb.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/users_helper.rb')
| -rw-r--r-- | app/helpers/users_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 1786e632117..d126981fb27 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -187,7 +187,7 @@ module UsersHelper def user_display_name(user) return s_('UserProfile|Blocked user') if user.blocked? - can_read_profile = can?(user, :read_user_profile, current_user) + can_read_profile = can?(current_user, :read_user_profile, user) return s_('UserProfile|Unconfirmed user') unless user.confirmed? || can_read_profile user.name |