diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 10:08:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 10:08:36 +0300 |
commit | 48aff82709769b098321c738f3444b9bdaa694c6 (patch) | |
tree | e00c7c43e2d9b603a5a6af576b1685e400410dee /lib/gitlab/git/repository.rb | |
parent | 879f5329ee916a948223f8f43d77fba4da6cd028 (diff) |
Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42
Diffstat (limited to 'lib/gitlab/git/repository.rb')
-rw-r--r-- | lib/gitlab/git/repository.rb | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index 8ace4157ad7..1a3409c1f84 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -297,10 +297,17 @@ module Gitlab end file_name = "#{name}.#{extension}" - File.join(storage_path, self.gl_repository, sha, file_name) + File.join(storage_path, self.gl_repository, sha, archive_version_path, file_name) end private :archive_file_path + def archive_version_path + return '' unless Feature.enabled?(:include_lfs_blobs_in_archive) + + '@v2' + end + private :archive_version_path + # Return repo size in megabytes def size size = gitaly_repository_client.repository_size @@ -580,9 +587,9 @@ module Gitlab tags.find { |tag| tag.name == name } end - def merge_to_ref(user, source_sha, branch, target_ref, message, first_parent_ref) + def merge_to_ref(user, source_sha, branch, target_ref, message, first_parent_ref, allow_conflicts) wrapped_gitaly_errors do - gitaly_operation_client.user_merge_to_ref(user, source_sha, branch, target_ref, message, first_parent_ref) + gitaly_operation_client.user_merge_to_ref(user, source_sha, branch, target_ref, message, first_parent_ref, allow_conflicts) end end @@ -610,7 +617,7 @@ module Gitlab } wrapped_gitaly_errors do - gitaly_operation_client.user_revert(args) + gitaly_operation_client.user_revert(**args) end end @@ -626,7 +633,7 @@ module Gitlab } wrapped_gitaly_errors do - gitaly_operation_client.user_cherry_pick(args) + gitaly_operation_client.user_cherry_pick(**args) end end @@ -640,7 +647,7 @@ module Gitlab } wrapped_gitaly_errors do - gitaly_operation_client.user_update_submodule(args) + gitaly_operation_client.user_update_submodule(**args) end end |