Merge branch 'wiki-empty-page-heading' into 'master'

Fix wiki empty page translation namespace not being removed Closes #38920 See merge request gitlab-org/gitlab-ce!14759

Merge branch 'wiki-empty-page-heading' into 'master'
161a9eaf · Filipa Lacerda · Lin Jen-Shin · b7f3eac5 · 161a9eaf
Commit 161a9eaf authored Oct 09, 2017 by Filipa Lacerda Committed by Lin Jen-Shin Oct 13, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

empty.html.haml app/views/projects/wikis/empty.html.haml +1 -1

No files found.
--- a/app/views/projects/wikis/empty.html.haml
+++ b/app/views/projects/wikis/empty.html.haml
 - page_title _("Wiki")

-%h3.page-title= _("Wiki|Empty page")
+%h3.page-title= s_("Wiki|Empty page")
 %hr
 .error_message
  = s_("WikiEmptyPageError|You are not allowed to create wiki pages")