diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-09 06:15:10 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-09 06:15:10 +0300 |
commit | dc149736154b6f3a244573f299fa0d6283399ec1 (patch) | |
tree | 42c0b51e74b28263e0b8d1bf1ec0af9340a39db4 /app/services | |
parent | 60c4a86ee6faf8209d3896eec65860dd8b69563c (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services')
-rw-r--r-- | app/services/projects/create_service.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb index e4b0fca729a..6f29c72e25a 100644 --- a/app/services/projects/create_service.rb +++ b/app/services/projects/create_service.rb @@ -13,11 +13,11 @@ module Projects @skip_wiki = @params.delete(:skip_wiki) @initialize_with_sast = Gitlab::Utils.to_boolean(@params.delete(:initialize_with_sast)) @initialize_with_readme = Gitlab::Utils.to_boolean(@params.delete(:initialize_with_readme)) - @use_sha256_repository = Gitlab::Utils.to_boolean(@params.delete(:use_sha256_repository)) && Feature.enabled?(:support_sha256_repositories, user) @import_data = @params.delete(:import_data) @relations_block = @params.delete(:relations_block) @default_branch = @params.delete(:default_branch) @readme_template = @params.delete(:readme_template) + @repository_object_format = @params.delete(:repository_object_format) build_topics end @@ -214,7 +214,10 @@ module Projects end def repository_object_format - @use_sha256_repository ? Repository::FORMAT_SHA256 : Repository::FORMAT_SHA1 + return Repository::FORMAT_SHA1 unless Feature.enabled?(:support_sha256_repositories, current_user) + return Repository::FORMAT_SHA256 if @repository_object_format == Repository::FORMAT_SHA256 + + Repository::FORMAT_SHA1 end def readme_content |