diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo index 326621df2ba3..2c74706e907f 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1752679148 -SHA256 (go/devel_gitaly/gitaly-v18.2.0/go.mod) = ec7c02d0d63b1125e6446a6c2ada6fc2efa12d332da58b7c9c9cd56103cc51ed -SIZE (go/devel_gitaly/gitaly-v18.2.0/go.mod) = 13011 -SHA256 (go/devel_gitaly/gitaly-v18.2.0/gitaly-v18.2.0.tar.bz2) = 8d1543f363464030eb72c83d6d32f6020e7c912de95fb3a33659995d20598d0f -SIZE (go/devel_gitaly/gitaly-v18.2.0/gitaly-v18.2.0.tar.bz2) = 4543392 -SHA256 (go/devel_gitaly/gitaly-v18.2.0/git-v2.50.0.tar.bz2) = 33e44c038ae6b3ff526e6927c2c6ff1658fd7f3c7334b079c019fa08f8ab20e4 -SIZE (go/devel_gitaly/gitaly-v18.2.0/git-v2.50.0.tar.bz2) = 9249878 +TIMESTAMP = 1753327146 +SHA256 (go/devel_gitaly/gitaly-v18.2.1/go.mod) = ec7c02d0d63b1125e6446a6c2ada6fc2efa12d332da58b7c9c9cd56103cc51ed +SIZE (go/devel_gitaly/gitaly-v18.2.1/go.mod) = 13011 +SHA256 (go/devel_gitaly/gitaly-v18.2.1/gitaly-v18.2.1.tar.bz2) = 3144eba5edd72e66e0f7b3fb8b3fb1d2d6dc6cb5bc45fadd284980401535840d +SIZE (go/devel_gitaly/gitaly-v18.2.1/gitaly-v18.2.1.tar.bz2) = 4543282 +SHA256 (go/devel_gitaly/gitaly-v18.2.1/git-v2.50.0.tar.bz2) = 33e44c038ae6b3ff526e6927c2c6ff1658fd7f3c7334b079c019fa08f8ab20e4 +SIZE (go/devel_gitaly/gitaly-v18.2.1/git-v2.50.0.tar.bz2) = 9249878 diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo index 9edabb89baeb..b57e09ee5cb9 100644 --- a/net/gitlab-agent/distinfo +++ b/net/gitlab-agent/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1752677035 -SHA256 (go/net_gitlab-agent/gitlab-agent-v18.2.0/v18.2.0.mod) = 4772214d0f7667ed5a2f465d728888c258c09e89afb5e4b0e6e5a087b77057fd -SIZE (go/net_gitlab-agent/gitlab-agent-v18.2.0/v18.2.0.mod) = 9809 -SHA256 (go/net_gitlab-agent/gitlab-agent-v18.2.0/v18.2.0.zip) = 23e76612b7c0694ef093e71826bb94386f7f18531f9ffb4122a4e823bb48af94 -SIZE (go/net_gitlab-agent/gitlab-agent-v18.2.0/v18.2.0.zip) = 1707851 +TIMESTAMP = 1753327147 +SHA256 (go/net_gitlab-agent/gitlab-agent-v18.2.1/v18.2.1.mod) = 4772214d0f7667ed5a2f465d728888c258c09e89afb5e4b0e6e5a087b77057fd +SIZE (go/net_gitlab-agent/gitlab-agent-v18.2.1/v18.2.1.mod) = 9809 +SHA256 (go/net_gitlab-agent/gitlab-agent-v18.2.1/v18.2.1.zip) = 7ab07ce329dd3e34591233ee00192068064752f61b577f2bfed86c285576cc0f +SIZE (go/net_gitlab-agent/gitlab-agent-v18.2.1/v18.2.1.zip) = 1708969 diff --git a/net/rubygem-gitaly/Makefile b/net/rubygem-gitaly/Makefile index 0b4ff68cc031..b0dad500647d 100644 --- a/net/rubygem-gitaly/Makefile +++ b/net/rubygem-gitaly/Makefile @@ -1,20 +1,20 @@ PORTNAME= gitaly -PORTVERSION= 18.1.0 +PORTVERSION= 18.2.1 CATEGORIES= net rubygems MASTER_SITES= RG MAINTAINER= mfechner@FreeBSD.org COMMENT= Auto-generated gRPC client for gitaly WWW= https://gitlab.com/gitlab-org/gitaly LICENSE= MIT RUN_DEPENDS= rubygem-grpc-gitlab>=1.0<2.0:net/rubygem-grpc-gitlab USES= cpe gem CPE_VENDOR= gitlab NO_ARCH= yes .include diff --git a/net/rubygem-gitaly/distinfo b/net/rubygem-gitaly/distinfo index ebbf3d3cdf11..7796ac38fe37 100644 --- a/net/rubygem-gitaly/distinfo +++ b/net/rubygem-gitaly/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1750222113 -SHA256 (rubygem/gitaly-18.1.0.gem) = 80f8dd89005ad5788a7af07f101484c1b1dad423e90cc0405daaa85c27d1b7fc -SIZE (rubygem/gitaly-18.1.0.gem) = 53248 +TIMESTAMP = 1753336806 +SHA256 (rubygem/gitaly-18.2.1.gem) = 7409135d7dbc29ec8021e694420963e1da86dcc45252065fce813c19cb5c9bb3 +SIZE (rubygem/gitaly-18.2.1.gem) = 53248 diff --git a/net/rubygem-gitlab-kas-grpc/distinfo b/net/rubygem-gitlab-kas-grpc/distinfo index e3643c1df22c..3787efb94b44 100644 --- a/net/rubygem-gitlab-kas-grpc/distinfo +++ b/net/rubygem-gitlab-kas-grpc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1752677055 -SHA256 (rubygem/gitlab-kas-grpc-18.2.0.gem) = c14314fdcac6ef12794f6293979d0e2fcbcb01bb55fb04ee37e10d4337a99b6e -SIZE (rubygem/gitlab-kas-grpc-18.2.0.gem) = 10752 +TIMESTAMP = 1753327162 +SHA256 (rubygem/gitlab-kas-grpc-18.2.1.gem) = 971519aaaf9b34097c9a919312361c9686997fab22e09cfb50d951ed5ab245e2 +SIZE (rubygem/gitlab-kas-grpc-18.2.1.gem) = 10752 diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo index ea3024c9d6d7..63b3fe32f1c1 100644 --- a/www/gitlab-pages/distinfo +++ b/www/gitlab-pages/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1752677038 -SHA256 (go/www_gitlab-pages/gitlab-pages-v18.2.0/go.mod) = fabce2d66cf34e44e541a57220574dbef2778f98afa0e86272882385608871f1 -SIZE (go/www_gitlab-pages/gitlab-pages-v18.2.0/go.mod) = 3435 -SHA256 (go/www_gitlab-pages/gitlab-pages-v18.2.0/gitlab-pages-v18.2.0.tar.bz2) = 39ac8c911693ce0549c8da818577ae78b193ed6f1d27b48abddc92c446989ed7 -SIZE (go/www_gitlab-pages/gitlab-pages-v18.2.0/gitlab-pages-v18.2.0.tar.bz2) = 236137 +TIMESTAMP = 1753327149 +SHA256 (go/www_gitlab-pages/gitlab-pages-v18.2.1/go.mod) = fabce2d66cf34e44e541a57220574dbef2778f98afa0e86272882385608871f1 +SIZE (go/www_gitlab-pages/gitlab-pages-v18.2.1/go.mod) = 3435 +SHA256 (go/www_gitlab-pages/gitlab-pages-v18.2.1/gitlab-pages-v18.2.1.tar.bz2) = 3c174591200800c22d1eb654d09235db6aeb63313eab6a50c3e2ec0aa41d0fac +SIZE (go/www_gitlab-pages/gitlab-pages-v18.2.1/gitlab-pages-v18.2.1.tar.bz2) = 236018 diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo index 04b929e44a9d..6e64f5266cd7 100644 --- a/www/gitlab-workhorse/distinfo +++ b/www/gitlab-workhorse/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1752677054 -SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.2.0/go.mod) = 188c374b005aba0ee613477584379e4f1f3344b4f68d33274c9aac043c95f448 -SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.2.0/go.mod) = 9293 -SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.2.0/gitlab-foss-v18.2.0.tar.bz2) = 23a1309fb73f19ccfc3100611e1149a3405563862d697829e9cf0080c9487565 -SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.2.0/gitlab-foss-v18.2.0.tar.bz2) = 121280838 +TIMESTAMP = 1753327162 +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.2.1/go.mod) = dbd6a92d66a1a0a418aab39bf166a48ea5a4c892fe69fe19b12b347ea74936db +SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.2.1/go.mod) = 9384 +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.2.1/gitlab-foss-v18.2.1.tar.bz2) = 47df0d49390cf5fb28af71ee99608d826158399c3a164ec64b41aec9c04a0207 +SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.2.1/gitlab-foss-v18.2.1.tar.bz2) = 121288065 diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common index 5b26abcfe873..a2e98918f414 100644 --- a/www/gitlab/Makefile.common +++ b/www/gitlab/Makefile.common @@ -1,17 +1,17 @@ -GITLAB_VERSION= 18.2.0 +GITLAB_VERSION= 18.2.1 GITLAB_PORTREVISION= 0 # Git version gitaly should use (from gitlab mirror) # Find current tag from Makefile and .gitlab-ci.yaml # and from https://gitlab.com/gitlab-org/git/-/tags GITLAB_GIT_VERSION= 2.50.0 # return something like x.yy GITLAB_GIT_VERSION_SHORT= ${GITLAB_GIT_VERSION:C/^([0-9]*\.[0-9]*)\..*/\1/} # Overwrite version for gitlab-kas-grpc GITLAB_KAS_GRPC_VERSION= ${GITLAB_VERSION} #GITLAB_KAS_GRPC_VERSION= 17.11.0.pre.rc43 # Rails version RAILS_VERSION= 7.1.5.1 diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo index df7dca2e03fe..67a668af820f 100644 --- a/www/gitlab/distinfo +++ b/www/gitlab/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1752677001 -SHA256 (gitlab-foss-v18.2.0.tar.bz2) = 23a1309fb73f19ccfc3100611e1149a3405563862d697829e9cf0080c9487565 -SIZE (gitlab-foss-v18.2.0.tar.bz2) = 121280838 -TIMESTAMP = 1752677001 -SHA256 (gitlab-v18.2.0-ee.tar.bz2) = 867f7292eec847e786a56c7fb15c7d8139993e3e29e2e7dd0bc9f580167470e9 -SIZE (gitlab-v18.2.0-ee.tar.bz2) = 136600640 +TIMESTAMP = 1753327140 +SHA256 (gitlab-foss-v18.2.1.tar.bz2) = 47df0d49390cf5fb28af71ee99608d826158399c3a164ec64b41aec9c04a0207 +SIZE (gitlab-foss-v18.2.1.tar.bz2) = 121288065 +TIMESTAMP = 1753327140 +SHA256 (gitlab-v18.2.1-ee.tar.bz2) = f1cb7cb49ae20a3ddec3ca36bff457550a7b9383dd8b3ff42cd7104fac0c2bd7 +SIZE (gitlab-v18.2.1-ee.tar.bz2) = 136599618 diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index 12b4438204ba..f57ee976650d 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,224 +1,228 @@ ---- Gemfile.orig 2025-07-16 11:39:10 UTC +--- Gemfile.orig 2025-07-22 11:41:34 UTC +++ Gemfile @@ -164,8 +164,8 @@ gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', fea gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', feature_category: :shared # GraphQL API -gem 'graphql', '2.4.13', feature_category: :api -gem 'graphql-docs', '~> 5.0.0', group: [:development, :test], feature_category: :api +gem 'graphql', '~> 2.4.13', feature_category: :api +#gem 'graphql-docs', '~> 5.0.0', group: [:development, :test], feature_category: :api gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api # Cells @@ -220,7 +220,7 @@ gem 'google-cloud-storage', '~> 1.45.0', feature_categ gem 'google-apis-storage_v1', '~> 0.29', feature_category: :shared gem 'google-cloud-storage', '~> 1.45.0', feature_category: :shared # We need >= 0.11.1 because that's when match_glob support is added to list_objects -gem 'google-apis-core', '~> 0.11.0', '>= 0.11.1', feature_category: :shared +gem 'google-apis-core', '~> 0.11', '>= 0.11.1', feature_category: :shared gem 'google-apis-compute_v1', '~> 0.57.0', feature_category: :shared gem 'google-apis-container_v1', '~> 0.43.0', feature_category: :shared gem 'google-apis-container_v1beta1', '~> 0.43.0', feature_category: :shared @@ -231,7 +231,7 @@ gem 'google-apis-androidpublisher_v3', '~> 0.34.0', fe gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0', feature_category: :shared gem 'google-apis-androidpublisher_v3', '~> 0.34.0', feature_category: :shared -gem 'googleauth', '~> 1.8.1', feature_category: :shared +gem 'googleauth', '~> 1.8', feature_category: :shared gem 'google-cloud-artifact_registry-v1', '~> 0.11.0', feature_category: :shared gem 'google-cloud-compute-v1', '~> 2.6.0', feature_category: :shared @@ -295,7 +295,7 @@ gem 'state_machines-activerecord', '~> 0.8.0', feature gem 'state_machines-activerecord', '~> 0.8.0', feature_category: :shared # Background jobs -gem 'sidekiq', path: 'vendor/gems/sidekiq', require: 'sidekiq', feature_category: :scalability +gem 'sidekiq', '>= 7.3.9', require: 'sidekiq', feature_category: :scalability gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', @@ -465,143 +465,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared gem 'warning', '~> 1.5.0', feature_category: :shared -group :development do - gem 'lefthook', '~> 1.11.0', require: false, feature_category: :tooling - gem 'rubocop', feature_category: :tooling - - gem 'solargraph', '~> 0.54.0', require: false, feature_category: :shared - gem 'solargraph-rspec', '~> 0.5.1', require: false, feature_category: :shared - - gem 'letter_opener_web', '~> 3.0.0', feature_category: :shared - gem 'lookbook', '~> 2.3', feature_category: :shared - - # Better errors handler - gem 'better_errors', '~> 2.10.1', feature_category: :shared - - gem 'sprite-factory', '~> 1.7', feature_category: :shared - - gem 'listen', '~> 3.7', feature_category: :shared - - gem 'ruby-lsp', "~> 0.23.0", require: false, feature_category: :tooling - - gem 'ruby-lsp-rails', "~> 0.3.6", feature_category: :tooling - - gem 'ruby-lsp-rspec', "~> 0.1.10", require: false, feature_category: :tooling - - gem 'gdk-toogle', '~> 0.9', '>= 0.9.5', require: 'toogle', feature_category: :tooling - - # Used by - # * `lib/tasks/gitlab/security/update_banned_ssh_keys.rake` - # * `lib/tasks/gitlab/db/migration_squash.rake` - gem 'git', '~> 1.8', feature_category: :shared -end - -group :development, :test do - gem 'deprecation_toolkit', '~> 2.2.3', require: false, feature_category: :shared - gem 'bullet', '~> 8.0.0', feature_category: :shared - gem 'parser', '= 3.3.8.0', feature_category: :shared - gem 'pry-byebug', feature_category: :shared - gem 'pry-rails', '~> 0.3.9', feature_category: :shared - gem 'pry-shell', '~> 0.6.4', feature_category: :shared - - gem 'awesome_print', require: false, feature_category: :shared - - gem 'database_cleaner-active_record', '~> 2.2.0', feature_category: :database - gem 'rspec-rails', '~> 7.1.0', feature_category: :shared - gem 'factory_bot_rails', '~> 6.5.0', feature_category: :tooling - - # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) - gem 'minitest', '~> 5.11.0', feature_category: :shared - - gem 'spring', '~> 4.3.0', feature_category: :shared - gem 'spring-commands-rspec', '~> 1.0.4', feature_category: :shared - - gem 'gitlab-styles', '~> 13.1.0', feature_category: :tooling, require: false - gem 'haml_lint', '~> 0.58', feature_category: :tooling, require: false - - # Benchmarking & profiling - gem 'benchmark-ips', '~> 2.14.0', require: false, feature_category: :shared - gem 'benchmark-memory', '~> 0.1', require: false, feature_category: :shared - - # Profiling data from CI/CD pipelines - gem 'influxdb-client', '~> 3.1', require: false, feature_category: :tooling - - gem 'knapsack', '~> 4.0.0', feature_category: :tooling - gem 'gitlab-crystalball', '~> 1.1.0', require: false, feature_category: :tooling - gem 'test_file_finder', '~> 0.3.1', feature_category: :tooling - - gem 'simple_po_parser', '~> 1.1.6', require: false, feature_category: :shared - - gem 'png_quantizator', '~> 0.2.1', require: false, feature_category: :shared - - gem 'parallel', '~> 1.19', require: false, feature_category: :shared - - gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup', feature_category: :shared - - gem 'pact', '~> 1.64', feature_category: :shared - - # For now we only use vite in development / test, and not for production builds - # See: https://gitlab.com/gitlab-org/frontend/rfcs/-/issues/106 - gem 'vite_rails', '~> 3.0.17', feature_category: :shared - gem 'vite_ruby', '~> 3.9.0', feature_category: :shared - - gem 'gitlab-housekeeper', path: 'gems/gitlab-housekeeper', feature_category: :tooling - - gem 'yard', '~> 0.9', require: false, feature_category: :tooling -end - group :development, :test, :danger do gem 'gitlab-dangerfiles', '~> 4.9.0', require: false, feature_category: :tooling end -group :development, :test, :coverage do - gem 'simplecov', '~> 0.22', require: false, feature_category: :tooling - gem 'simplecov-lcov', '~> 0.8.0', require: false, feature_category: :tooling - gem 'simplecov-cobertura', '~> 2.1.0', require: false, feature_category: :tooling - gem 'undercover', '~> 0.7.0', require: false, feature_category: :tooling -end - # Gems required in omnibus-gitlab pipeline group :development, :test, :omnibus do gem 'license_finder', '~> 7.0', require: false, feature_category: :shared end -# Gems required in various pipelines -group :development, :test, :monorepo do - gem 'gitlab-rspec', path: 'gems/gitlab-rspec', feature_category: :shared - gem 'gitlab-rspec_flaky', path: 'gems/gitlab-rspec_flaky', feature_category: :tooling -end - -group :test do - gem 'rspec-retry', '~> 0.6.2', feature_category: :tooling - gem 'rspec_profiling', '~> 0.0.9', feature_category: :tooling - gem 'rspec-benchmark', '~> 0.6.0', feature_category: :tooling - gem 'rspec-parameterized', '~> 1.0', '>= 1.0.2', require: false, feature_category: :tooling - gem 'os', '~> 1.1', '>= 1.1.4', feature_category: :tooling - - gem 'capybara', '~> 3.40', feature_category: :test_platform - gem 'capybara-screenshot', '~> 1.0.26', feature_category: :test_platform - gem 'selenium-webdriver', '~> 4.21', '>= 4.21.1', feature_category: :test_platform - - gem 'graphlyte', '~> 1.0.0', feature_category: :shared - - gem 'shoulda-matchers', '~> 6.4.0', require: false, feature_category: :shared - gem 'email_spec', '~> 2.3.0', feature_category: :shared - gem 'webmock', '~> 3.25.0', feature_category: :shared - gem 'rails-controller-testing', feature_category: :shared - gem 'concurrent-ruby', '~> 1.1', feature_category: :shared - gem 'test-prof', '~> 1.4.0', feature_category: :tooling - gem 'rspec_junit_formatter', feature_category: :shared - gem 'guard-rspec', feature_category: :shared - gem 'axe-core-rspec', '~> 4.10.0', feature_category: :tooling - gem 'state_machines-rspec', '~> 0.6', feature_category: :shared - - # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 - gem 'derailed_benchmarks', require: false, feature_category: :shared - - gem 'gitlab_quality-test_tooling', '~> 2.10.0', require: false, feature_category: :tooling -end - gem 'octokit', '~> 9.0', feature_category: :importers # Needed by octokit: https://github.com/octokit/octokit.rb/pull/1688 gem 'faraday-multipart', '~> 1.0', feature_category: :importers -@@ -639,11 +511,11 @@ gem 'gitaly', '~> 18.1.0.pre.rc1', feature_category: : - gem 'gitaly', '~> 18.1.0.pre.rc1', feature_category: :gitaly +@@ -636,14 +508,14 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :inside + gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat + + # Gitaly GRPC protocol definitions +-gem 'gitaly', '~> 18.1.0.pre.rc1', feature_category: :gitaly ++gem 'gitaly', '~> 18.1', feature_category: :gitaly # KAS GRPC protocol definitions -gem 'gitlab-kas-grpc', '~> 18.1.0', feature_category: :deployment_management +gem 'gitlab-kas-grpc', '~> 18.2.0', feature_category: :deployment_management # Lock until 1.74.0 is available # https://gitlab.com/gitlab-com/gl-infra/production/-/issues/20067 -gem 'grpc', '= 1.63.0', feature_category: :shared +gem 'grpc', '~> 1.63', feature_category: :shared gem 'google-protobuf', '~> 3.25', '>= 3.25.3', feature_category: :shared @@ -664,7 +536,7 @@ gem 'gitlab-net-dns', '~> 0.12.0', feature_category: : gem 'gitlab-net-dns', '~> 0.12.0', feature_category: :shared # Countries list -gem 'countries', '~> 4.0.0', feature_category: :shared +gem 'countries', '~> 4.0', feature_category: :shared gem 'retriable', '~> 3.1.2', feature_category: :shared @@ -746,10 +618,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc gem 'duo_api', '~> 1.3', feature_category: :system_access +gem 'parser' +gem 'net-smtp' +gem 'net-pop' +gem 'psych', '~> 3.1' + gem 'gitlab-sdk', '~> 0.3.0', feature_category: :application_instrumentation gem 'paper_trail', '~> 16.0', feature_category: :shared -gem "i18n_data", "~> 0.13.1", feature_category: :system_access +gem "i18n_data", "~> 0.13", feature_category: :system_access gem "gitlab-cloud-connector", "~> 1.21", require: 'gitlab/cloud_connector', feature_category: :plan_provisioning