Add latest changes from gitlab-org/gitlab@master

1 files changed, 12 insertions, 4 deletions

diff --git a/app/presenters/snippet_blob_presenter.rb b/app/presenters/snippet_blob_presenter.rb
index 71361b18f5a..70a373619d6 100644
--- a/app/presenters/snippet_blob_presenter.rb
+++ b/app/presenters/snippet_blob_presenter.rb
@@ -1,16 +1,20 @@
 # frozen_string_literal: true
 
 class SnippetBlobPresenter < BlobPresenter
-  def highlighted_data
+  def rich_data
     return if blob.binary?
 
-    highlight(plain: false)
+    if markup?
+      blob.rendered_markup
+    else
+      highlight(plain: false)
+    end
   end
 
-  def plain_highlighted_data
+  def plain_data
     return if blob.binary?
 
-    highlight(plain: true)
+    highlight(plain: !markup?)
   end
 
   def raw_path
@@ -23,6 +27,10 @@ class SnippetBlobPresenter < BlobPresenter
 
   private
 
+  def markup?
+    blob.rich_viewer&.partial_name == 'markup'
+  end
+
   def snippet
     blob.snippet
   end