VladPolskiy/gitlab-foss
1
0
Fork 0
mirror of https://gitlab.com/gitlab-org/gitlab-foss.git synced 2025-07-23 00:47:51 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Add latest changes from gitlab-org/gitlab@master

Browse Source
This commit is contained in:
GitLab Bot
2024-09-23 12:07:33 +00:00
parent 686d497df7
commit a8f5ba2021
66 changed files with 1115 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gems/gitlab-backup-cli/Gemfile
View File

@ -7,4 +7,5 @@ gemspec
group :development, :test do
gem 'gitlab-rspec', path: '../gitlab-rspec'
gem 'pry'
end

138
gems/gitlab-backup-cli/Gemfile.lock
View File

@ -10,36 +10,50 @@ PATH
remote: .
specs:
gitlab-backup-cli (0.0.1)
activesupport (< 7.2)
activesupport (~> 7.0.8.4)
addressable (~> 2.8)
concurrent-ruby (~> 1.1)
faraday (~> 2)
google-cloud-storage_transfer (~> 1.2.0)
google-protobuf (~> 3.25, >= 3.25.3)
googleauth (~> 1.8.1)
grpc (= 1.63.0)
json (~> 2.7.2)
jwt (~> 2.5)
logger (~> 1.5.3)
minitest (~> 5.11.0)
parallel (~> 1.19)
rack (~> 2.2.9)
rainbow (~> 3.0)
rexml (~> 3.3.2)
thor (~> 1.3)
GEM
remote: https://rubygems.org/
specs:
activemodel (7.0.8.1)
activesupport (= 7.0.8.1)
activerecord (7.0.8.1)
activemodel (= 7.0.8.1)
activesupport (= 7.0.8.1)
activesupport (7.0.8.1)
activemodel (7.0.8.4)
activesupport (= 7.0.8.4)
activerecord (7.0.8.4)
activemodel (= 7.0.8.4)
activesupport (= 7.0.8.4)
activesupport (7.0.8.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
ast (2.4.2)
base64 (0.2.0)
concurrent-ruby (1.2.3)
diff-lcs (1.5.0)
coderay (1.1.3)
concurrent-ruby (1.3.4)
diff-lcs (1.5.1)
factory_bot (6.4.6)
activesupport (>= 5.0.0)
faraday (2.9.0)
faraday-net_http (>= 2.0, < 3.2)
faraday-net_http (3.1.0)
faraday (2.11.0)
faraday-net_http (>= 2.0, < 3.4)
logger
faraday-net_http (3.3.0)
net-http
faraday-retry (2.2.1)
faraday (~> 2.0)
@ -57,10 +71,10 @@ GEM
rubocop-performance (~> 1.15)
rubocop-rails (~> 2.17)
rubocop-rspec (~> 2.22)
google-cloud-core (1.7.0)
google-cloud-core (1.7.1)
google-cloud-env (>= 1.0, < 3.a)
google-cloud-errors (~> 1.0)
google-cloud-env (2.1.1)
google-cloud-env (2.2.0)
faraday (>= 1.0, < 3.a)
google-cloud-errors (1.4.0)
google-cloud-storage_transfer (1.2.0)
@ -69,15 +83,15 @@ GEM
google-cloud-storage_transfer-v1 (0.8.0)
gapic-common (>= 0.20.0, < 2.a)
google-cloud-errors (~> 1.0)
google-protobuf (3.25.3)
google-protobuf (3.25.3-arm64-darwin)
google-protobuf (3.25.3-x86_64-linux)
googleapis-common-protos (1.5.0)
google-protobuf (~> 3.18)
google-protobuf (3.25.4)
google-protobuf (3.25.4-arm64-darwin)
google-protobuf (3.25.4-x86_64-linux)
googleapis-common-protos (1.6.0)
google-protobuf (>= 3.18, < 5.a)
googleapis-common-protos-types (~> 1.7)
grpc (~> 1.41)
googleapis-common-protos-types (1.14.0)
google-protobuf (~> 3.18)
googleapis-common-protos-types (1.15.0)
google-protobuf (>= 3.18, < 5.a)
googleauth (1.8.1)
faraday (>= 0.17.3, < 3.a)
jwt (>= 1.4, < 3.0)
@ -93,41 +107,46 @@ GEM
grpc (1.63.0-x86_64-linux)
google-protobuf (~> 3.25)
googleapis-common-protos-types (~> 1.0)
i18n (1.14.4)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
json (2.6.3)
jwt (2.8.1)
json (2.7.2)
jwt (2.8.2)
base64
language_server-protocol (3.17.0.3)
minitest (5.22.3)
logger (1.5.3)
method_source (1.1.0)
minitest (5.11.3)
multi_json (1.15.0)
net-http (0.4.1)
uri
os (1.1.4)
parallel (1.23.0)
parser (3.2.2.4)
parallel (1.26.3)
parser (3.3.3.0)
ast (~> 2.4.1)
racc
public_suffix (5.0.5)
racc (1.7.3)
rack (3.0.8)
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (6.0.1)
racc (1.8.1)
rack (2.2.9)
rainbow (3.1.1)
rake (13.1.0)
regexp_parser (2.8.2)
rexml (3.2.6)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
rspec-mocks (~> 3.12.0)
rspec-core (3.12.2)
rspec-support (~> 3.12.0)
rspec-expectations (3.12.3)
rake (13.2.1)
regexp_parser (2.9.2)
rexml (3.3.7)
rspec (3.13.0)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
rspec-mocks (~> 3.13.0)
rspec-core (3.13.1)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-mocks (3.12.6)
rspec-support (~> 3.13.0)
rspec-mocks (3.13.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-support (3.12.1)
rspec-support (~> 3.13.0)
rspec-support (3.13.1)
rubocop (1.57.2)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
@ -139,22 +158,22 @@ GEM
rubocop-ast (>= 1.28.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.30.0)
parser (>= 3.2.1.0)
rubocop-capybara (2.19.0)
rubocop-ast (1.32.3)
parser (>= 3.3.1.0)
rubocop-capybara (2.21.0)
rubocop (~> 1.41)
rubocop-factory_bot (2.25.1)
rubocop (~> 1.41)
rubocop-factory_bot (2.24.0)
rubocop (~> 1.33)
rubocop-graphql (0.19.0)
rubocop (>= 0.87, < 2)
rubocop-performance (1.19.1)
rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
rubocop-performance (1.21.1)
rubocop (>= 1.48.1, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-rails (2.20.0)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0)
rubocop-rspec (2.25.0)
rubocop-rspec (2.27.1)
rubocop (~> 1.40)
rubocop-capybara (~> 2.17)
rubocop-factory_bot (~> 2.22)
@ -164,11 +183,11 @@ GEM
faraday (>= 0.17.5, < 3.a)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
thor (1.3.0)
thor (1.3.2)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.5.0)
uri (0.13.0)
uri (0.13.1)
PLATFORMS
arm64-darwin-21
@ -181,9 +200,12 @@ DEPENDENCIES
gitlab-backup-cli!
gitlab-rspec!
gitlab-styles (~> 11.0)
parser (= 3.3.3.0)
pry
rake (~> 13.0)
rspec (~> 3.0)
rubocop-rails (<= 2.20)
rubocop-factory_bot (~> 2.25.1)
rubocop-rspec (~> 2.27.1)
BUNDLED WITH
2.5.18

21
gems/gitlab-backup-cli/gitlab-backup-cli.gemspec
View File

@ -24,15 +24,32 @@ Gem::Specification.new do |spec|
spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
spec.require_paths = ["lib"]
spec.add_dependency "activesupport", "< 7.2"
spec.add_dependency "activesupport", "~> 7.0.8.4"
spec.add_dependency "googleauth", "~> 1.8.1" # https://gitlab.com/gitlab-org/gitlab/-/issues/449019
spec.add_dependency "google-cloud-storage_transfer", "~> 1.2.0"
spec.add_dependency "rainbow", "~> 3.0"
spec.add_dependency "thor", "~> 1.3"
# The following gems are pinned at specific version to keep
# gem versions at par with gitlab/Gemfile
spec.add_dependency "addressable", "~> 2.8"
spec.add_dependency "concurrent-ruby", "~> 1.1"
spec.add_dependency "faraday", "~> 2"
spec.add_dependency "google-protobuf", "~> 3.25", ">= 3.25.3"
spec.add_dependency "grpc", "= 1.63.0"
spec.add_dependency "json", "~> 2.7.2"
spec.add_dependency "jwt", "~> 2.5"
spec.add_dependency "logger", "~> 1.5.3"
spec.add_dependency "minitest", "~> 5.11.0"
spec.add_dependency "parallel", "~> 1.19"
spec.add_dependency "rack", "~> 2.2.9"
spec.add_dependency "rexml", "~> 3.3.2"
spec.add_development_dependency "factory_bot", "~> 6.4.6"
spec.add_development_dependency "gitlab-styles", "~> 11.0"
spec.add_development_dependency "parser", "= 3.3.3.0"
spec.add_development_dependency "rake", "~> 13.0"
spec.add_development_dependency "rspec", "~> 3.0"
spec.add_development_dependency "rubocop-rails", "<= 2.20" # https://github.com/rubocop/rubocop-rails/issues/1173
spec.add_development_dependency "rubocop-factory_bot", "~> 2.25.1" # https://github.com/rubocop/rubocop-rspec/issues/1916
spec.add_development_dependency "rubocop-rspec", "~> 2.27.1"
end

12
gems/gitlab-backup-cli/spec/thor/gitlab_backup_cli_backup_spec.rb
View File

@ -14,12 +14,12 @@ RSpec.describe 'gitlab-backup-cli backup subcommand', type: :thor do
gitlab-backup-cli backup help [COMMAND] # Describe subcommands or one specific subcommand
Options:
[--backup-bucket=BACKUP_BUCKET] # When backing up object storage, this is the bucket to backup to
[--wait-for-completion], [--no-wait-for-completion] # Wait for object storage backups to complete
# Default: true
[--registry-bucket=REGISTRY_BUCKET] # When backing up registry from object storage, this is the source bucket
[--service-account-file=SERVICE_ACCOUNT_FILE] # JSON file containing the Google service account credentials
# Default: /etc/gitlab/backup-account-credentials.json
[--backup-bucket=BACKUP_BUCKET] # When backing up object storage, this is the bucket to backup to
[--wait-for-completion], [--no-wait-for-completion], [--skip-wait-for-completion] # Wait for object storage backups to complete
# Default: true
[--registry-bucket=REGISTRY_BUCKET] # When backing up registry from object storage, this is the source bucket
[--service-account-file=SERVICE_ACCOUNT_FILE] # JSON file containing the Google service account credentials
# Default: /etc/gitlab/backup-account-credentials.json
COMMAND
end