From 85dc423f7090da0a52c73eb66faf22ddb20efff9 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Sat, 19 Sep 2020 01:45:44 +0000
Subject: Add latest changes from gitlab-org/gitlab@13-4-stable-ee

---
 app/services/snippets/base_service.rb                  | 2 +-
 app/services/snippets/create_service.rb                | 2 +-
 app/services/snippets/destroy_service.rb               | 2 ++
 app/services/snippets/repository_validation_service.rb | 4 ++--
 app/services/snippets/update_service.rb                | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'app/services/snippets')

diff --git a/app/services/snippets/base_service.rb b/app/services/snippets/base_service.rb
index d9e8326f159..53a04e5a398 100644
--- a/app/services/snippets/base_service.rb
+++ b/app/services/snippets/base_service.rb
@@ -46,7 +46,7 @@ module Snippets
         snippet.errors.add(:snippet_actions, 'have invalid data')
       end
 
-      snippet_error_response(snippet, 403)
+      snippet_error_response(snippet, 422)
     end
 
     def snippet_error_response(snippet, http_status)
diff --git a/app/services/snippets/create_service.rb b/app/services/snippets/create_service.rb
index dab47de8a36..5c9b2eb1aea 100644
--- a/app/services/snippets/create_service.rb
+++ b/app/services/snippets/create_service.rb
@@ -82,7 +82,7 @@ module Snippets
 
     def create_commit
       commit_attrs = {
-        branch_name: 'master',
+        branch_name: @snippet.default_branch,
         message: 'Initial commit'
       }
 
diff --git a/app/services/snippets/destroy_service.rb b/app/services/snippets/destroy_service.rb
index 977626fcf17..f1f80dbaf86 100644
--- a/app/services/snippets/destroy_service.rb
+++ b/app/services/snippets/destroy_service.rb
@@ -58,3 +58,5 @@ module Snippets
     end
   end
 end
+
+Snippets::DestroyService.prepend_if_ee('EE::Snippets::DestroyService')
diff --git a/app/services/snippets/repository_validation_service.rb b/app/services/snippets/repository_validation_service.rb
index c8197795383..5bf5e692ef4 100644
--- a/app/services/snippets/repository_validation_service.rb
+++ b/app/services/snippets/repository_validation_service.rb
@@ -39,7 +39,7 @@ module Snippets
     def check_branch_name_default!
       branches = repository.branch_names
 
-      return if branches.first == Gitlab::Checks::SnippetCheck::DEFAULT_BRANCH
+      return if branches.first == snippet.default_branch
 
       raise RepositoryValidationError, _('Repository has an invalid default branch name.')
     end
@@ -51,7 +51,7 @@ module Snippets
     end
 
     def check_file_count!
-      file_count = repository.ls_files(nil).size
+      file_count = repository.ls_files(snippet.default_branch).size
       limit = Snippet.max_file_limit(current_user)
 
       if file_count > limit
diff --git a/app/services/snippets/update_service.rb b/app/services/snippets/update_service.rb
index 00146389e22..a0e9ab6ffda 100644
--- a/app/services/snippets/update_service.rb
+++ b/app/services/snippets/update_service.rb
@@ -93,7 +93,7 @@ module Snippets
       raise UpdateError unless snippet.snippet_repository
 
       commit_attrs = {
-        branch_name: 'master',
+        branch_name: snippet.default_branch,
         message: 'Update snippet'
       }
 
-- 
cgit v1.2.3