Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 5 deletions

diff --git a/app/presenters/snippet_blob_presenter.rb b/app/presenters/snippet_blob_presenter.rb
index ed9c28bbc2c..d27fe751ab7 100644
--- a/app/presenters/snippet_blob_presenter.rb
+++ b/app/presenters/snippet_blob_presenter.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class SnippetBlobPresenter < BlobPresenter
+  include GitlabRoutingHelper
+
   def rich_data
     return if blob.binary?
     return unless blob.rich_viewer
@@ -15,15 +17,17 @@ class SnippetBlobPresenter < BlobPresenter
   end
 
   def raw_path
-    if snippet.is_a?(ProjectSnippet)
-      raw_project_snippet_path(snippet.project, snippet)
-    else
-      raw_snippet_path(snippet)
-    end
+    return gitlab_raw_snippet_blob_path(blob) if snippet_multiple_files?
+
+    gitlab_raw_snippet_path(snippet)
   end
 
   private
 
+  def snippet_multiple_files?
+    blob.container.repository_exists? && Feature.enabled?(:snippet_multiple_files, current_user)
+  end
+
   def snippet
     blob.container
   end