Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-03-27 12:16:21 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-03-27 12:16:21 +0300
commitff3955ef8efc9582d14c0f684dc8e856475231bd (patch)
tree95e751639d1f84093cf06e02c44ce473cfe8f4dd /app/views/users
parentbf360857d96de6ae8989af058a88ace9b94e90cc (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/users')
-rw-r--r--app/views/users/show.html.haml3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 6ba37072230..4607e2e974c 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -51,7 +51,8 @@
.avatar-holder
= link_to avatar_icon_for_user(@user, 400, current_user: current_user), target: '_blank', rel: 'noopener noreferrer' do
= render Pajamas::AvatarComponent.new(@user, alt: "", size: 96, avatar_options: { itemprop: "image" })
- #js-user-achievements{ data: { root_url: root_url, user_id: @user.id } }
+ - if Ability.allowed?(current_user, :read_user_profile, @user)
+ #js-user-achievements{ data: { root_url: root_url, user_id: @user.id } }
.gl-display-inline-block.gl-vertical-align-top.gl-text-left.gl-max-w-80
- if @user.blocked? || !@user.confirmed?
.user-info