Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 5 deletions

diff --git a/app/models/concerns/blob_language_from_git_attributes.rb b/app/models/concerns/blob_language_from_git_attributes.rb
index 56e1276a220..01878e067b9 100644
--- a/app/models/concerns/blob_language_from_git_attributes.rb
+++ b/app/models/concerns/blob_language_from_git_attributes.rb
@@ -1,13 +1,11 @@
 # frozen_string_literal: true
 
-# Applicable for blob classes with project attribute
 module BlobLanguageFromGitAttributes
   extend ActiveSupport::Concern
 
   def language_from_gitattributes
-    return unless project
+    return unless repository&.exists?
 
-    repository = project.repository
     repository.gitattribute(path, 'gitlab-language')
   end
 end
diff --git a/app/models/snippet.rb b/app/models/snippet.rb
index 814a88dbd09..745700b1c65 100644
--- a/app/models/snippet.rb
+++ b/app/models/snippet.rb
@@ -197,7 +197,11 @@ class Snippet < ApplicationRecord
   end
 
   def blob
-    @blob ||= Blob.decorate(SnippetBlob.new(self), nil)
+    @blob ||= Blob.decorate(SnippetBlob.new(self), self)
+  end
+
+  def blobs
+    repository.ls_files(repository.root_ref).map { |file| Blob.lazy(self, repository.root_ref, file) }
   end
 
   def hook_attrs
@@ -208,7 +212,7 @@ class Snippet < ApplicationRecord
     super.to_s
   end
 
-  def sanitized_file_name
+  def self.sanitized_file_name(file_name)
     file_name.gsub(/[^a-zA-Z0-9_\-\.]+/, '')
   end