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-08-10 00:10:17 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-08-10 00:10:17 +0300
commit413c91fda942270905873684a58041f8c65f878c (patch)
tree8053b007997cc1266b5d9c86794fd8f6beff0eae /app/views/users
parent7d112a9002182130f6a06f890bb17450b03406f9 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/users')
-rw-r--r--app/views/users/show.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 810a2ca3607..e2ddbb90213 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -26,7 +26,7 @@
= s_("UserProfile|Edit profile")
= render 'users/view_gpg_keys'
= render 'users/view_user_in_admin_area'
- .js-user-profile-actions{ data: { user_id: @user.id, rss_subscription_path: can?(current_user, :read_user_profile, @user) ? user_path(@user, rss_url_options) : '' } }
+ .js-user-profile-actions{ data: user_profile_actions_data(@user) }
- else
= render layout: 'users/cover_controls' do
- if @user == current_user