Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40

1 files changed, 0 insertions, 18 deletions

diff --git a/app/helpers/wiki_helper.rb b/app/helpers/wiki_helper.rb
index 786081ca815..3f82cf893a0 100644
--- a/app/helpers/wiki_helper.rb
+++ b/app/helpers/wiki_helper.rb
@@ -50,24 +50,6 @@ module WikiHelper
       end
   end
 
-  def wiki_page_errors(error)
-    return unless error
-
-    content_tag(:div, class: 'alert alert-danger') do
-      case error
-      when WikiPage::PageChangedError
-        page_link = link_to s_("WikiPageConflictMessage|the page"), wiki_page_path(@wiki, @page), target: "_blank"
-        concat(
-          (s_("WikiPageConflictMessage|Someone edited the page the same time you did. Please check out %{page_link} and make sure your changes will not unintentionally remove theirs.") % { page_link: page_link }).html_safe
-        )
-      when WikiPage::PageRenameError
-        s_("WikiEdit|There is already a page with the same title in that path.")
-      else
-        error.message
-      end
-    end
-  end
-
   def wiki_attachment_upload_url
     case @wiki.container
     when Project