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
path: root/app/views
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-03-04 01:32:18 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-03-04 01:32:18 +0300
commitb7a47b151165e1313c9c526e1af8032601f7afd7 (patch)
tree8966651a39b27595341c180ef14d65f147c2b527 /app/views
parentfa206403d6b6a501488b70173ba873189776edc6 (diff)
Add latest changes from gitlab-org/security/gitlab@13-9-stable-ee
Diffstat (limited to 'app/views')
-rw-r--r--app/views/shared/wikis/show.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/shared/wikis/show.html.haml b/app/views/shared/wikis/show.html.haml
index 6d14ba8fe7b..8a5cd94bde9 100644
--- a/app/views/shared/wikis/show.html.haml
+++ b/app/views/shared/wikis/show.html.haml
@@ -7,7 +7,7 @@
.nav-text.flex-fill
%span.wiki-last-edit-by
- if @page.last_version
- = html_escape(_("Last edited by %{link_start}%{avatar} %{name}%{link_end}")) % { avatar: image_tag(avatar_icon_for_email(@page.last_version.author_email, 24), class: "avatar s24 float-none gl-mr-0!"), name: "<strong>#{@page.last_version.author_name}</strong>".html_safe, link_start: "<a href='#{@page.last_version.author_url}'>".html_safe, link_end: '</a>'.html_safe }
+ = wiki_page_version_author_header(@page.last_version)
= time_ago_with_tooltip(@page.last_version.authored_date)
.nav-controls.pb-md-3.pb-lg-0