Add latest changes from gitlab-org/gitlab@master

2 files changed, 9 insertions, 1 deletions

diff --git a/app/presenters/snippet_blob_presenter.rb b/app/presenters/snippet_blob_presenter.rb
index 70a373619d6..8e593d3a5fe 100644
--- a/app/presenters/snippet_blob_presenter.rb
+++ b/app/presenters/snippet_blob_presenter.rb
@@ -32,7 +32,7 @@ class SnippetBlobPresenter < BlobPresenter
   end
 
   def snippet
-    blob.snippet
+    blob.container
   end
 
   def language
diff --git a/app/presenters/snippet_presenter.rb b/app/presenters/snippet_presenter.rb
index a453be18b95..ba9d566932a 100644
--- a/app/presenters/snippet_presenter.rb
+++ b/app/presenters/snippet_presenter.rb
@@ -27,6 +27,14 @@ class SnippetPresenter < Gitlab::View::Presenter::Delegated
     snippet.submittable_as_spam_by?(current_user)
   end
 
+  def blob
+    if Feature.enabled?(:version_snippets, current_user) && !snippet.repository.empty?
+      snippet.blobs.first
+    else
+      snippet.blob
+    end
+  end
+
   private
 
   def can_access_resource?(ability_prefix)