diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
commit | 85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch) | |
tree | 9160f299afd8c80c038f08e1545be119f5e3f1e1 /app/services/snippets/repository_validation_service.rb | |
parent | 15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff) |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'app/services/snippets/repository_validation_service.rb')
-rw-r--r-- | app/services/snippets/repository_validation_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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 |