From 1ca9950d5f890cd8f185e1eda158b969a7244fe2 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 11 Feb 2020 18:08:58 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 app/presenters/snippet_blob_presenter.rb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'app/presenters')

diff --git a/app/presenters/snippet_blob_presenter.rb b/app/presenters/snippet_blob_presenter.rb
index 9baaacdbb24..71361b18f5a 100644
--- a/app/presenters/snippet_blob_presenter.rb
+++ b/app/presenters/snippet_blob_presenter.rb
@@ -4,11 +4,13 @@ class SnippetBlobPresenter < BlobPresenter
   def highlighted_data
     return if blob.binary?
 
-    if blob.rich_viewer&.partial_name == 'markup'
-      blob.rendered_markup
-    else
-      highlight
-    end
+    highlight(plain: false)
+  end
+
+  def plain_highlighted_data
+    return if blob.binary?
+
+    highlight(plain: true)
   end
 
   def raw_path
-- 
cgit v1.2.3