summaryrefslogtreecommitdiff
path: root/app/views/users/show.html.haml
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/users/show.html.haml')
-rw-r--r--app/views/users/show.html.haml8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index ee037a7d66a..9f6b0bc2373 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -1,7 +1,7 @@
- @hide_top_links = true
- @hide_breadcrumbs = true
- @no_container = true
-- page_title @user.blocked? ? s_('UserProfile|Blocked user') : @user.name
+- page_title user_display_name(@user)
- page_description @user.bio_html
- header_title @user.name, user_path(@user)
- page_itemtype 'http://schema.org/Person'
@@ -38,10 +38,10 @@
= link_to avatar_icon_for_user(@user, 400), target: '_blank', rel: 'noopener noreferrer' do
= image_tag avatar_icon_for_user(@user, 90), class: "avatar s90", alt: '', itemprop: 'image'
- - if @user.blocked?
+ - if @user.blocked? || !@user.confirmed?
.user-info
.cover-title
- = s_('UserProfile|Blocked user')
+ = user_display_name(@user)
= render "users/profile_basic_info"
- else
.user-info
@@ -139,7 +139,7 @@
- if can?(current_user, :read_cross_project)
%h4.prepend-top-20
= s_('UserProfile|Most Recent Activity')
- .content_list{ data: { href: user_path } }
+ .content_list{ data: { href: user_activity_path } }
.loading
.spinner.spinner-md
- unless @user.bot?