From 189df8bf7e58bebdd764dc575d15b7b4d1bc7cd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 6 Oct 2024 18:53:30 -0700 Subject: [PATCH 01/11] imagemagick: 7.1.1-38 -> 7.1.1-39 Diff: https://github.com/ImageMagick/ImageMagick/compare/7.1.1-38...7.1.1-39 Changelog: https://github.com/ImageMagick/Website/blob/main/ChangeLog.md (cherry picked from commit fcfdc7a358e4a79ad5913e863587460a6b4185d6) --- pkgs/applications/graphics/ImageMagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 30649f04cc42..7491000ea725 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -51,13 +51,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.1-38"; + version = "7.1.1-39"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = finalAttrs.version; - hash = "sha256-dyk9kCH1w76Jhy/yBhVFLthTKYaMgXLBn7QGWAFS0XU="; + hash = "sha256-3NUl0q/j3dBdNBtLH+69vh0elobBnTOvqQpC/2KwGBU="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big From 99e496765b1e3be2f0926e6a4d507bba4e996441 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Thu, 24 Oct 2024 12:13:35 +0200 Subject: [PATCH 02/11] gitlab: 17.2.9 -> 17.3.6 (cherry picked from commit 77804e950a3ef6ad8eac0926e9aba8d77df521bb) --- .../version-management/gitlab/data.json | 16 +- .../gitlab/gitaly/default.nix | 6 +- .../version-management/gitlab/gitaly/git.nix | 4 +- .../gitlab-container-registry/default.nix | 6 +- .../gitlab/gitlab-pages/default.nix | 6 +- .../gitlab/gitlab-shell/default.nix | 6 +- .../gitlab/gitlab-workhorse/default.nix | 4 +- .../version-management/gitlab/rubyEnv/Gemfile | 109 ++-- .../gitlab/rubyEnv/Gemfile.lock | 311 ++++++----- .../gitlab/rubyEnv/gemset.nix | 482 +++++++++--------- 10 files changed, 497 insertions(+), 453 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 033870a4e421..42f2c2dc4756 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "17.2.9", - "repo_hash": "060d5rzbcnhr1fsvbaiirgjm5rjr5c5r6yi601lxvksffyn5hmxw", - "yarn_hash": "10y540bxwaz355p9r4q34199aibadrd5p4d9ck2y3n6735k0hm74", + "version": "17.3.6", + "repo_hash": "1dysv5xblm33z4vlnkz2s43w6cqrhmzq1729sab3x0zznyaa5vks", + "yarn_hash": "1g5xqggdbrxz6ablav119jw8a2v8qdd2cwlbvpygablbcxqak41l", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v17.2.9-ee", + "rev": "v17.3.6-ee", "passthru": { - "GITALY_SERVER_VERSION": "17.2.9", - "GITLAB_PAGES_VERSION": "17.2.9", - "GITLAB_SHELL_VERSION": "14.37.0", + "GITALY_SERVER_VERSION": "17.3.6", + "GITLAB_PAGES_VERSION": "17.3.6", + "GITLAB_SHELL_VERSION": "14.38.0", "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.2.0", - "GITLAB_WORKHORSE_VERSION": "17.2.9" + "GITLAB_WORKHORSE_VERSION": "17.3.6" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 715408b52234..f6ba224d4b1c 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -7,7 +7,7 @@ }: let - version = "17.2.9"; + version = "17.3.6"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -21,10 +21,10 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-UgNQtM3NdAUJVP+vvTHtZWSjCmVzsHlEtXQroxKorIY="; + hash = "sha256-nXblQfr9ml6F5nNz64haN7ub+cuN3eao14N0Y2d3n0Y="; }; - vendorHash = "sha256-FqnGVRldhevJgBBvJcvGXzRaYWqSHzZiXIQmCNzJv+4="; + vendorHash = "sha256-spfSOOe+9NGu+2ZbEGb93X3HnANEXYbvP73DD6neIXQ="; ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ]; diff --git a/pkgs/applications/version-management/gitlab/gitaly/git.nix b/pkgs/applications/version-management/gitlab/gitaly/git.nix index a6d272b2fbb7..2610c39ca711 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/git.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/git.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "gitaly-git"; - version = "2.44.2.gl1"; + version = "2.45.2"; # `src` attribute for nix-update src = fetchFromGitLab { owner = "gitlab-org"; repo = "git"; rev = "v${version}"; - hash = "sha256-VIffbZZEbGjVW1No8zojSQlX/ciJ2DJnaogNlQtc77o="; + hash = "sha256-R4K5b4d1DQw+pwoOCAK4EJtVPXQDPossTUmVv0LJtUs="; }; # we actually use the gitaly build system diff --git a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix index 1d543d2d2432..608f22451a30 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "gitlab-container-registry"; - version = "4.10.0"; + version = "4.11.0"; rev = "v${version}-gitlab"; # nixpkgs-update: no auto update @@ -10,10 +10,10 @@ buildGoModule rec { owner = "gitlab-org"; repo = "container-registry"; inherit rev; - hash = "sha256-9OiuA0TqRfnZKfAeLbIcPUw5qH6twWKqt0IP8roaWNg="; + hash = "sha256-wUypldxi3O5sm4i9v2HiZjqUy/JwtcRPvCCmINCk4YU="; }; - vendorHash = "sha256-Bzhg5coOrs3JO6Qslr9csUIrnCMJiG89Fio8ziJjH9k="; + vendorHash = "sha256-Ed+WvdWpEU5c9v14eM1PdCcT3qRnaRF/XeUKedPmaSU="; postPatch = '' # Disable flaky inmemory storage driver test diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 7fb674689237..f0fb34deeb91 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "17.2.9"; + version = "17.3.6"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-ggfPZ/PMjgfRzzPZdVCVydd/4mdCfh2xh7QWGjp5U/0="; + hash = "sha256-yieOM9QQuQQ4RkfjASpcEvIKwbYMT9LkkJPHAYhY7uY="; }; - vendorHash = "sha256-yNHeM8MExcLwv2Ga4vtBmPFBt/Rj7Gd4QQYDlnAIo+c="; + vendorHash = "sha256-O8kWiOpgVCUD6DdM95F1b+j4Gv9LTLRdBjByqXWV7Pk="; subPackages = [ "." ]; meta = with lib; { diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index ff0c06abe0dc..0f4227d47663 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "14.37.0"; + version = "14.38.0"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - hash = "sha256-to4ZIFKEiM4FCznoLrvHua9/hIqiHcviALzfay+1rb8="; + hash = "sha256-oYvsSjdzfJn4ujy1qbMmqZyEQFbYTSke8t3KBqjr/Vc="; }; buildInputs = [ ruby libkrb5 ]; @@ -18,7 +18,7 @@ buildGoModule rec { ./remove-hardcoded-locations.patch ]; - vendorHash = "sha256-TbjpCCo/ZdFP+yE2h8B8kwS08iUilXNgBT2F5Si7/dc="; + vendorHash = "sha256-YOShgZv0zdfXgKi//IENt6wE2m0S1Kqa+2ndvCwKDLQ="; postInstall = '' cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 235ddbf54aed..7386a939817f 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "17.2.9"; + version = "17.3.6"; # nixpkgs-update: no auto update src = fetchFromGitLab { @@ -17,7 +17,7 @@ buildGoModule rec { sourceRoot = "${src.name}/workhorse"; - vendorHash = "sha256-ZWpuJTlGCsjjURa8iYTaGMKulx99uyYJ+dr2cL9hiwo="; + vendorHash = "sha256-sLr9kFKRNYOlCj9bmP+J7/Iu/OfFTEjAm64BUni+eiY="; buildInputs = [ git ]; ldflags = [ "-X main.Version=${version}" ]; doCheck = false; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 2bb3d4092ed8..56051fbe4876 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -1,5 +1,9 @@ # frozen_string_literal: true +def next? + File.basename(__FILE__) == "Gemfile.next" +end + source 'https://rubygems.org' if ENV.fetch('BUNDLER_CHECKSUM_VERIFICATION_OPT_IN', 'false') != 'false' # this verification is still experimental @@ -24,7 +28,12 @@ gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', requir # https://gitlab.com/gitlab-org/gitlab/-/issues/375713 # # See https://docs.gitlab.com/ee/development/gemfile.html#upgrade-rails for guidelines when upgrading Rails -gem 'rails', '~> 7.0.8.4' # rubocop:todo Gemfile/MissingFeatureCategory + +if next? + gem 'rails', '~> 7.1.3.4', feature_category: :shared +else + gem 'rails', '~> 7.0.8.4', feature_category: :shared +end gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab' # rubocop:todo Gemfile/MissingFeatureCategory @@ -50,7 +59,7 @@ gem 'responders', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'sprockets', '~> 3.7.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'sprockets-rails', '~> 3.5.1' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'view_component', '~> 3.12.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'view_component', '~> 3.13.0' # rubocop:todo Gemfile/MissingFeatureCategory # Supported DBs gem 'pg', '~> 1.5.6', feature_category: :database @@ -59,7 +68,11 @@ gem 'neighbor', '~> 0.3.2', feature_category: :duo_chat gem 'rugged', '~> 1.6' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'faraday', '~> 1.10.3' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'faraday', '~> 2', feature_category: :shared +gem 'faraday-retry', '~> 2', feature_category: :shared +# Logger is a dependency of Faraday, but Logger 1.6.0 does not work with Chef. +gem 'logger', '~> 1.5.3' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'marginalia', '~> 1.11.1' # rubocop:todo Gemfile/MissingFeatureCategory # Authorization @@ -75,8 +88,8 @@ gem 'bcrypt', '~> 3.1', '>= 3.1.14' # rubocop:todo Gemfile/MissingFeatureCategor gem 'doorkeeper', '~> 5.6', '>= 5.6.6' # rubocop:todo Gemfile/MissingFeatureCategory gem 'doorkeeper-openid_connect', '~> 1.8', '>= 1.8.7' # rubocop:todo Gemfile/MissingFeatureCategory gem 'doorkeeper-device_authorization_grant', '~> 1.0.0', feature_category: :system_access -gem 'rexml', '~> 3.2.6' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'ruby-saml', '~> 1.17.0', feature_category: :system_access +gem 'rexml', '~> 3.3.2' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'ruby-saml', '~> 1.17.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth', '~> 2.1.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-auth0', '~> 3.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-azure-activedirectory-v2', '~> 2.0' # rubocop:todo Gemfile/MissingFeatureCategory @@ -85,16 +98,16 @@ gem 'omniauth-github', '2.0.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-google-oauth2', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-oauth2-generic', '~> 0.2.2' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'omniauth-saml', '~> 2.2.1', feature_category: :system_access +gem 'omniauth-saml', '~> 2.2.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-shibboleth-redux', '~> 2.0', require: 'omniauth-shibboleth' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md # rubocop:todo Gemfile/MissingFeatureCategory -gem 'omniauth_openid_connect', '~> 0.6.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'omniauth_openid_connect', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeatureCategory # Locked until Ruby 3.0 upgrade since upgrading will pull in an updated net-smtp gem. # See https://docs.gitlab.com/ee/development/emails.html#rationale. -gem 'openid_connect', '= 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'openid_connect', '~> 2.3.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce' # See gem README.md # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-atlassian-oauth2', '~> 0.2.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'rack-oauth2', '~> 1.21.3' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'rack-oauth2', '~> 2.2.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'jwt', '~> 2.5' # rubocop:todo Gemfile/MissingFeatureCategory # Kerberos authentication. EE-only @@ -116,7 +129,7 @@ gem 'attr_encrypted', '~> 3.2.4', path: 'vendor/gems/attr_encrypted' # rubocop:t gem 'validates_hostname', '~> 1.0.13' # rubocop:todo Gemfile/MissingFeatureCategory gem 'rubyzip', '~> 2.3.2', require: 'zip' # rubocop:todo Gemfile/MissingFeatureCategory # GitLab Pages letsencrypt support -gem 'acme-client', '~> 2.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'acme-client', '~> 2.0.18' # rubocop:todo Gemfile/MissingFeatureCategory # Browser detection gem 'browser', '~> 5.3.1' # rubocop:todo Gemfile/MissingFeatureCategory @@ -146,7 +159,17 @@ gem 'graphql', '~> 2.3.5', feature_category: :api gem 'graphql-docs', '~> 5.0.0', group: [:development, :test], feature_category: :api gem 'graphiql-rails', '~> 1.10', feature_category: :api gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api -gem 'graphlient', '~> 0.6.0', feature_category: :importers # Used by BulkImport feature (group::import) +gem 'graphlient', '~> 0.8.0', feature_category: :importers # Used by BulkImport feature (group::import) + +# Cells +gem 'gitlab-topology-service-client', '~> 0.1', + path: 'vendor/gems/gitlab-topology-service-client', + feature_category: :cell + +# Duo Workflow +gem 'gitlab-duo-workflow-service-client', '~> 0.1', + path: 'vendor/gems/gitlab-duo-workflow-service-client', + feature_category: :duo_workflow # Generate Fake data gem 'ffaker', '~> 2.23' # rubocop:todo Gemfile/MissingFeatureCategory @@ -177,7 +200,7 @@ gem 'fog-local', '~> 0.8' # rubocop:todo Gemfile/MissingFeatureCategory # We may want to update this dependency if this is ever addressed upstream, e.g. via # https://github.com/aliyun/aliyun-oss-ruby-sdk/pull/93 gem 'fog-aliyun', '~> 0.4' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'gitlab-fog-azure-rm', '~> 1.9.1', require: 'fog/azurerm' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'gitlab-fog-azure-rm', '~> 2.0.1', require: 'fog/azurerm', feature_category: :shared # for Google storage @@ -205,14 +228,16 @@ gem 'google-cloud-compute-v1', '~> 2.6.0', feature_category: :shared gem 'seed-fu', '~> 2.3.7' # rubocop:todo Gemfile/MissingFeatureCategory # Search -gem 'elasticsearch-model', '~> 7.2' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'elasticsearch-api', '7.13.3' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'aws-sdk-core', '~> 3.199.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'elasticsearch-model', '~> 7.2', feature_category: :global_search +gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation', feature_category: :global_search +gem 'elasticsearch-api', '7.17.11', feature_category: :global_search +gem 'aws-sdk-core', '~> 3.201.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'aws-sdk-s3', '~> 1.154.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'faraday_middleware-aws-sigv4', '~>0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections # rubocop:todo Gemfile/MissingFeatureCategory +gem 'aws-sdk-s3', '~> 1.157.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'faraday-typhoeus', '~> 1.1', feature_category: :global_search +gem 'faraday_middleware-aws-sigv4', '~> 1.0.1', feature_category: :global_search +# Used with Elasticsearch to support http keep-alive connections +gem 'typhoeus', '~> 1.4.0', feature_category: :global_search # Markdown and HTML processing gem 'html-pipeline', '~> 2.14.3', feature_category: :team_planning @@ -253,9 +278,6 @@ end # State machine gem 'state_machines-activerecord', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeatureCategory -# CI domain tags -gem 'acts-as-taggable-on', '~> 10.0' # rubocop:todo Gemfile/MissingFeatureCategory - # Background jobs gem 'sidekiq', '~> 7.1.6', feature_category: :scalability gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability @@ -331,9 +353,7 @@ gem 'loofah', '~> 2.22.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'licensee', '~> 9.16' # rubocop:todo Gemfile/MissingFeatureCategory # Detect and convert string character encoding -# We forked charlock_holmes at https://gitlab.com/gitlab-org/ruby/gems/charlock_holmes -# but changed it's name to 'static_holmes' in the gemspec file. -gem 'static_holmes', '~> 0.7.11', require: 'charlock_holmes', feature_category: :shared +gem 'charlock_holmes', '~> 0.7.9', feature_category: :shared # Detect mime content type from content gem 'ruby-magic', '~> 0.6' # rubocop:todo Gemfile/MissingFeatureCategory @@ -347,7 +367,7 @@ gem 'gitlab_chronic_duration', '~> 0.12' # rubocop:todo Gemfile/MissingFeatureCa gem 'rack-proxy', '~> 0.7.7' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'cssbundling-rails', '1.4.0', feature_category: :shared +gem 'cssbundling-rails', '1.4.1', feature_category: :shared gem 'terser', '1.0.2' # rubocop:todo Gemfile/MissingFeatureCategory gem 'click_house-client', path: 'gems/click_house-client', require: 'click_house/client' # rubocop:todo Gemfile/MissingFeatureCategory @@ -363,9 +383,9 @@ gem 'gitlab-license', '~> 2.5', feature_category: :shared gem 'rack-attack', '~> 6.7.0' # rubocop:todo Gemfile/MissingFeatureCategory # Sentry integration -gem 'sentry-ruby', '~> 5.17.3', feature_category: :error_tracking -gem 'sentry-rails', '~> 5.17.3', feature_category: :error_tracking -gem 'sentry-sidekiq', '~> 5.17.3', feature_category: :error_tracking +gem 'sentry-ruby', '~> 5.18.0', feature_category: :error_tracking +gem 'sentry-rails', '~> 5.18.0', feature_category: :error_tracking +gem 'sentry-sidekiq', '~> 5.18.0', feature_category: :error_tracking # PostgreSQL query parsing # @@ -404,7 +424,8 @@ gem 'webrick', '~> 1.8.1', require: false # rubocop:todo Gemfile/MissingFeatureC gem 'prometheus-client-mmap', '~> 1.1', '>= 1.1.1', require: 'prometheus/client' # rubocop:todo Gemfile/MissingFeatureCategory # Event-driven reactor for Ruby -gem 'async', '~> 2.12.1' # rubocop:disable Gemfile/MissingFeatureCategory -- This is general utility gem +# Required manually in config/initializers/require_async_gem +gem 'async', '~> 2.12.1', require: false # rubocop:disable Gemfile/MissingFeatureCategory -- This is general utility gem # OpenTelemetry group :opentelemetry do @@ -472,7 +493,7 @@ group :development, :test do gem 'awesome_print', require: false # rubocop:todo Gemfile/MissingFeatureCategory - gem 'database_cleaner-active_record', '~> 2.1.0', feature_category: :database + gem 'database_cleaner-active_record', '~> 2.2.0', feature_category: :database gem 'rspec-rails', '~> 6.1.1', feature_category: :shared gem 'factory_bot_rails', '~> 6.4.3', feature_category: :tooling @@ -494,7 +515,7 @@ group :development, :test do # Profiling data from CI/CD pipelines gem 'influxdb-client', '~> 3.1', require: false, feature_category: :tooling - gem 'knapsack', '~> 1.22.0', feature_category: :tooling + gem 'knapsack', '~> 4.0.0', feature_category: :tooling gem 'crystalball', '~> 0.7.0', require: false, feature_category: :tooling gem 'test_file_finder', '~> 0.3.1', feature_category: :tooling @@ -511,7 +532,7 @@ group :development, :test do # 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.5.0', feature_category: :shared + gem 'vite_ruby', '~> 3.7.0', feature_category: :shared gem 'gitlab-housekeeper', path: 'gems/gitlab-housekeeper', feature_category: :tooling end @@ -524,7 +545,7 @@ 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.4.4', require: false, feature_category: :tooling + gem 'undercover', '~> 0.5.0', require: false, feature_category: :tooling end # Gems required in omnibus-gitlab pipeline @@ -565,17 +586,19 @@ group :test do # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 gem 'derailed_benchmarks', require: false # rubocop:todo Gemfile/MissingFeatureCategory - gem 'gitlab_quality-test_tooling', '~> 1.31.0', require: false, feature_category: :tooling + gem 'gitlab_quality-test_tooling', '~> 1.33.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 gem 'gitlab-mail_room', '~> 0.0.24', require: 'mail_room', feature_category: :shared gem 'email_reply_trimmer', '~> 0.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'html2text' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'stackprof', '~> 0.2.25', require: false # rubocop:todo Gemfile/MissingFeatureCategory +gem 'stackprof', '~> 0.2.26', require: false, feature_category: :shared gem 'rbtrace', '~> 0.4', require: false # rubocop:todo Gemfile/MissingFeatureCategory gem 'memory_profiler', '~> 1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory gem 'activerecord-explain-analyze', '~> 0.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory @@ -600,12 +623,16 @@ gem 'ssh_data', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 17.1.0', feature_category: :gitaly +gem 'gitaly', '~> 17.2.0', feature_category: :gitaly # KAS GRPC protocol definitions -gem 'kas-grpc', '~> 0.5.0', feature_category: :deployment_management +gem 'kas-grpc', '~> 0.6.0', feature_category: :deployment_management -gem 'grpc', '~> 1.63', feature_category: :shared +# Lock the version before issues below are resolved: +# https://gitlab.com/gitlab-org/gitlab/-/issues/473169#note_2028352939 +# Or we can upgrade to a more recent version as long as we can confirm +# that it doesn't have the same issues. +gem 'grpc', '= 1.63.0', feature_category: :shared gem 'google-protobuf', '~> 3.25', '>= 3.25.3' # rubocop:todo Gemfile/MissingFeatureCategory @@ -654,7 +681,7 @@ gem 'valid_email', '~> 0.1' # rubocop:todo Gemfile/MissingFeatureCategory # JSON gem 'jsonb_accessor', '~> 1.3.10' # rubocop:todo Gemfile/MissingFeatureCategory gem 'json', '~> 2.7.2', feature_category: :shared -gem 'json_schemer', '~> 0.2.18' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'json_schemer', '~> 2.3.0', feature_category: :shared gem 'oj', '~> 3.13.21' # rubocop:todo Gemfile/MissingFeatureCategory gem 'oj-introspect', '~> 0.7' # rubocop:todo Gemfile/MissingFeatureCategory gem 'multi_json', '~> 1.14.1' # rubocop:todo Gemfile/MissingFeatureCategory @@ -702,3 +729,5 @@ gem 'net-http', '= 0.4.1', feature_category: :shared gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory gem 'gitlab-sdk', '~> 0.3.0', feature_category: :application_instrumentation + +gem 'openbao_client', path: 'gems/openbao_client' # rubocop:todo Gemfile/MissingFeatureCategory diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 681d70b50896..034a7d66fe5c 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -27,7 +27,9 @@ PATH remote: gems/gitlab-backup-cli specs: gitlab-backup-cli (0.0.1) - activesupport (~> 7.0.8) + activesupport (< 7.2) + google-cloud-storage_transfer (~> 1.2.0) + googleauth (~> 1.8.1) rainbow (~> 3.0) thor (~> 1.3) @@ -104,6 +106,12 @@ PATH diffy (~> 3.4) oj (~> 3.13.16) +PATH + remote: gems/openbao_client + specs: + openbao_client (1.0.0) + typhoeus (~> 1.0, >= 1.0.1) + PATH remote: vendor/gems/attr_encrypted specs: @@ -137,6 +145,18 @@ PATH specs: diff_match_patch (0.1.0) +PATH + remote: vendor/gems/gitlab-duo-workflow-service-client + specs: + gitlab-duo-workflow-service-client (0.1) + grpc + +PATH + remote: vendor/gems/gitlab-topology-service-client + specs: + gitlab-topology-service-client (0.1) + grpc + PATH remote: vendor/gems/mail-smtp_pool specs: @@ -186,9 +206,9 @@ GEM CFPropertyList (3.0.5) rexml RedCloth (4.3.3) - acme-client (2.0.11) + acme-client (2.0.18) faraday (>= 1.0, < 3.0.0) - faraday-retry (~> 1.0) + faraday-retry (>= 1.0, < 3.0.0) actioncable (7.0.8.4) actionpack (= 7.0.8.4) activesupport (= 7.0.8.4) @@ -257,8 +277,6 @@ GEM i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - acts-as-taggable-on (10.0.0) - activerecord (>= 6.1, < 7.2) addressable (2.8.1) public_suffix (>= 2.0.2, < 6.0) aes_key_wrap (1.1.0) @@ -291,7 +309,7 @@ GEM io-event (~> 1.6, >= 1.6.5) atlassian-jwt (0.2.1) jwt (~> 2.1) - attr_required (1.0.1) + attr_required (1.0.2) awesome_print (1.9.2) awrence (1.2.1) aws-eventstream (1.3.0) @@ -299,7 +317,7 @@ GEM aws-sdk-cloudformation (1.41.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.199.0) + aws-sdk-core (3.201.4) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) @@ -307,10 +325,10 @@ GEM aws-sdk-kms (1.76.0) aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.154.0) - aws-sdk-core (~> 3, >= 3.199.0) + aws-sdk-s3 (1.157.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.8) + aws-sigv4 (~> 1.5) aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) axe-core-api (4.9.1) @@ -324,14 +342,6 @@ GEM descendants_tracker (~> 0.0.4) ice_nine (~> 0.11.0) thread_safe (~> 0.3, >= 0.3.1) - azure-storage-blob (2.0.3) - azure-storage-common (~> 2.0) - nokogiri (~> 1, >= 1.10.8) - azure-storage-common (2.0.4) - faraday (~> 1.0) - faraday_middleware (~> 1.0, >= 1.0.0.rc1) - net-http-persistent (~> 4.0) - nokogiri (~> 1, >= 1.10.8) babosa (2.0.0) backport (1.2.0) base32 (0.3.2) @@ -353,7 +363,7 @@ GEM bindata (2.4.11) binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) - bootsnap (1.18.3) + bootsnap (1.18.4) msgpack (~> 1.2) browser (5.3.1) builder (3.2.4) @@ -383,6 +393,7 @@ GEM ssrf_filter (~> 1.0, < 1.1.0) cbor (0.5.9.8) character_set (1.8.0) + charlock_holmes (0.7.9) chef-config (18.3.0) addressable chef-utils (= 18.3.0) @@ -429,7 +440,7 @@ GEM git css_parser (1.14.0) addressable - cssbundling-rails (1.4.0) + cssbundling-rails (1.4.1) railties (>= 6.0.0) cvss-suite (3.0.1) danger (9.4.2) @@ -448,7 +459,7 @@ GEM danger-gitlab (8.0.0) danger gitlab (~> 4.2, >= 4.2.0) - database_cleaner-active_record (2.1.0) + database_cleaner-active_record (2.2.0) activerecord (>= 5.a) database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) @@ -525,27 +536,28 @@ GEM dumb_delegator (1.0.0) duo_api (1.3.0) e2mmap (0.1.0) - ecma-re-validator (0.3.0) - regexp_parser (~> 2.0) ed25519 (1.3.0) - elasticsearch (7.13.3) - elasticsearch-api (= 7.13.3) - elasticsearch-transport (= 7.13.3) - elasticsearch-api (7.13.3) + elasticsearch (7.17.11) + elasticsearch-api (= 7.17.11) + elasticsearch-transport (= 7.17.11) + elasticsearch-api (7.17.11) multi_json - elasticsearch-model (7.2.0) + elasticsearch-model (7.2.1) activesupport (> 3) elasticsearch (~> 7) hashie elasticsearch-rails (7.2.1) - elasticsearch-transport (7.13.3) - faraday (~> 1) + elasticsearch-transport (7.17.11) + base64 + faraday (>= 1, < 3) multi_json email_reply_trimmer (0.1.6) email_spec (2.2.0) htmlentities (~> 4.3.3) launchy (~> 2.1) mail (~> 2.7) + email_validator (2.2.4) + activemodel encryptor (3.0.0) erubi (1.12.0) escape_utils (1.3.0) @@ -565,36 +577,28 @@ GEM factory_bot_rails (6.4.3) factory_bot (~> 6.4) railties (>= 5.0.0) - faraday (1.10.3) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0) - faraday-multipart (~> 1.0) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.0) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - faraday-retry (~> 1.0) - ruby2_keywords (>= 0.0.4) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) + faraday (2.10.1) + faraday-net_http (>= 2.0, < 3.2) + logger + faraday-follow_redirects (0.3.0) + faraday (>= 1, < 3) faraday-http-cache (2.5.0) faraday (>= 0.8) - faraday-httpclient (1.0.1) faraday-multipart (1.0.4) multipart-post (~> 2) - faraday-net_http (1.0.1) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) - faraday-retry (1.0.3) - faraday_middleware (1.2.0) - faraday (~> 1.0) - faraday_middleware-aws-sigv4 (0.3.0) + faraday-net_http (3.1.0) + net-http + faraday-net_http_persistent (2.1.0) + faraday (~> 2.5) + net-http-persistent (~> 4.0) + faraday-retry (2.2.1) + faraday (~> 2.0) + faraday-typhoeus (1.1.0) + faraday (~> 2.0) + typhoeus (~> 1.4) + faraday_middleware-aws-sigv4 (1.0.1) aws-sigv4 (~> 1.0) - faraday (>= 0.15) + faraday (>= 2.0, < 3) fast_blank (1.0.1) fast_gettext (2.3.0) ffaker (2.23.0) @@ -688,7 +692,7 @@ GEM git (1.18.0) addressable (~> 2.8) rchardet (~> 1.8) - gitaly (17.1.2) + gitaly (17.2.0) grpc (~> 1.0) gitlab (4.19.0) httparty (~> 0.20) @@ -702,12 +706,15 @@ GEM gitlab-experiment (0.9.1) activesupport (>= 3.0) request_store (>= 1.0) - gitlab-fog-azure-rm (1.9.1) - azure-storage-blob (~> 2.0) - azure-storage-common (~> 2.0) + gitlab-fog-azure-rm (2.0.1) + faraday (~> 2.0) + faraday-follow_redirects (~> 0.3.0) + faraday-net_http_persistent (~> 2.0) fog-core (~> 2.1) fog-json (~> 1.2) mime-types + net-http-persistent (~> 4.0) + nokogiri (~> 1, >= 1.10.8) gitlab-glfm-markdown (0.0.17) rb_sys (= 0.9.94) gitlab-labkit (0.36.1) @@ -745,7 +752,7 @@ GEM omniauth (>= 1.3, < 3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) rubyntlm (~> 0.5) - gitlab_quality-test_tooling (1.31.0) + gitlab_quality-test_tooling (1.33.0) activesupport (>= 7.0, < 7.2) amatch (~> 0.4.1) gitlab (~> 4.19) @@ -833,7 +840,13 @@ GEM google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - google-protobuf (3.25.3) + google-cloud-storage_transfer (1.2.0) + google-cloud-core (~> 1.6) + google-cloud-storage_transfer-v1 (>= 0.5, < 2.a) + google-cloud-storage_transfer-v1 (0.8.0) + gapic-common (>= 0.20.0, < 2.a) + google-cloud-errors (~> 1.0) + google-protobuf (3.25.4) googleapis-common-protos (1.4.0) google-protobuf (~> 3.14) googleapis-common-protos-types (~> 1.2) @@ -874,9 +887,8 @@ GEM rack graphiql-rails (1.10.0) railties - graphlient (0.6.0) - faraday (>= 1.0) - faraday_middleware + graphlient (0.8.0) + faraday (~> 2.0) graphql-client graphlyte (1.0.0) graphql (2.3.5) @@ -985,16 +997,18 @@ GEM regexp_parser (~> 2.5) regexp_property_values (~> 1.0) json (2.7.2) - json-jwt (1.15.3) + json-jwt (1.16.6) activesupport (>= 4.2) aes_key_wrap + base64 bindata - httpclient - json_schemer (0.2.18) - ecma-re-validator (~> 0.3) + faraday (~> 2.0) + faraday-follow_redirects + json_schemer (2.3.0) + bigdecimal hana (~> 1.3) regexp_parser (~> 2.0) - uri_template (~> 0.7) + simpleidn (~> 0.2) jsonb_accessor (1.3.10) activerecord (>= 5.0) activesupport (>= 5.0) @@ -1014,9 +1028,9 @@ GEM activerecord kaminari-core (= 1.2.2) kaminari-core (1.2.2) - kas-grpc (0.5.0) + kas-grpc (0.6.0) grpc (~> 1.0) - knapsack (1.22.0) + knapsack (4.0.0) rake kramdown (2.3.2) rexml @@ -1060,7 +1074,7 @@ GEM rake (~> 13.0) locale (2.1.3) lockbox (1.3.0) - logger (1.6.0) + logger (1.5.3) lograge (0.11.2) actionpack (>= 4) activesupport (>= 4) @@ -1212,21 +1226,24 @@ GEM ruby-saml (~> 1.17) omniauth-shibboleth-redux (2.0.0) omniauth (>= 2.0.0) - omniauth_openid_connect (0.6.1) + omniauth_openid_connect (0.8.0) omniauth (>= 1.9, < 3) - openid_connect (~> 1.1) + openid_connect (~> 2.2) open4 (1.3.4) - openid_connect (1.3.0) + openid_connect (2.3.0) activemodel attr_required (>= 1.0.0) - json-jwt (>= 1.5.0) - rack-oauth2 (>= 1.6.1) - swd (>= 1.0.0) + email_validator + faraday (~> 2.0) + faraday-follow_redirects + json-jwt (>= 1.16) + mail + rack-oauth2 (~> 2.2) + swd (~> 2.0) tzinfo - validate_email validate_url - webfinger (>= 1.0.1) - openssl (3.1.0) + webfinger (~> 2.0) + openssl (3.2.0) openssl-signature_algorithm (1.3.0) openssl (> 2.0) opentelemetry-api (1.2.5) @@ -1241,6 +1258,10 @@ GEM opentelemetry-semantic_conventions opentelemetry-helpers-sql-obfuscation (0.1.0) opentelemetry-common (~> 0.20) + opentelemetry-instrumentation-action_mailer (0.1.0) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-active_support (~> 0.1) + opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-action_pack (0.9.0) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) @@ -1305,8 +1326,9 @@ GEM opentelemetry-api (~> 1.0) opentelemetry-common (~> 0.21.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-rails (0.30.1) + opentelemetry-instrumentation-rails (0.30.2) opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-action_mailer (~> 0.1.0) opentelemetry-instrumentation-action_pack (~> 0.9.0) opentelemetry-instrumentation-action_view (~> 0.7.0) opentelemetry-instrumentation-active_job (~> 0.7.0) @@ -1419,10 +1441,11 @@ GEM rack (>= 1.0, < 4) rack-cors (2.0.2) rack (>= 2.0.0) - rack-oauth2 (1.21.3) + rack-oauth2 (2.2.1) activesupport attr_required - httpclient + faraday (~> 2.0) + faraday-follow_redirects json-jwt (>= 1.11.0) rack (>= 2.1.0) rack-protection (2.2.2) @@ -1505,7 +1528,7 @@ GEM redis-rack (3.0.0) rack-session (>= 0.2.0) redis-store (>= 1.2, < 2) - redis-store (1.10.0) + redis-store (1.11.0) redis (>= 4, < 6) regexp_parser (2.6.0) regexp_property_values (1.0.0) @@ -1526,7 +1549,8 @@ GEM retriable (3.1.2) reverse_markdown (1.4.0) nokogiri - rexml (3.2.6) + rexml (3.3.2) + strscan rinku (2.0.0) rotp (6.3.0) rouge (4.3.0) @@ -1618,8 +1642,8 @@ GEM prism (>= 0.29.0, < 0.31) rbs (>= 3, < 4) sorbet-runtime (>= 0.5.10782) - ruby-lsp-rails (0.3.7) - ruby-lsp (>= 0.17.0, < 0.18.0) + ruby-lsp-rails (0.3.8) + ruby-lsp (>= 0.17.2, < 0.18.0) ruby-lsp-rspec (0.1.12) ruby-lsp (~> 0.17.0) ruby-magic (0.6.0) @@ -1655,24 +1679,25 @@ GEM seed-fu (2.3.7) activerecord (>= 3.1) activesupport (>= 3.1) - selenium-webdriver (4.21.1) + selenium-webdriver (4.23.0) base64 (~> 0.2) + logger (~> 1.4) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) - semver_dialects (3.4.0) + semver_dialects (3.4.3) deb_version (~> 1.0.1) pastel (~> 0.8.0) thor (~> 1.3) tty-command (~> 0.10.1) - sentry-rails (5.17.3) + sentry-rails (5.18.2) railties (>= 5.0) - sentry-ruby (~> 5.17.3) - sentry-ruby (5.17.3) + sentry-ruby (~> 5.18.2) + sentry-ruby (5.18.2) bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) - sentry-sidekiq (5.17.3) - sentry-ruby (~> 5.17.3) + sentry-sidekiq (5.18.2) + sentry-ruby (~> 5.18.2) sidekiq (>= 3.0) sexp_processor (4.17.1) shellany (0.0.1) @@ -1704,6 +1729,7 @@ GEM simplecov-html (0.12.3) simplecov-lcov (0.8.0) simplecov_json_formatter (0.1.4) + simpleidn (0.2.3) singleton (0.1.1) sixarm_ruby_unaccent (1.2.0) slack-messenger (2.3.6) @@ -1743,7 +1769,7 @@ GEM sprockets (>= 3.0.0) ssh_data (1.3.0) ssrf_filter (1.0.8) - stackprof (0.2.25) + stackprof (0.2.26) state_machines (0.5.0) state_machines-activemodel (0.8.0) activemodel (>= 5.1) @@ -1751,16 +1777,17 @@ GEM state_machines-activerecord (0.8.0) activerecord (>= 5.1) state_machines-activemodel (>= 0.8.0) - static_holmes (0.7.11) strings (0.2.1) strings-ansi (~> 0.2) unicode-display_width (>= 1.5, < 3.0) unicode_utils (~> 1.4) strings-ansi (0.2.0) - swd (1.3.0) + strscan (3.1.0) + swd (2.0.3) activesupport (>= 3) attr_required (>= 0.0.5) - httpclient (>= 2.4) + faraday (~> 2.0) + faraday-follow_redirects sync (0.5.0) sys-filesystem (1.4.3) ffi (~> 1.1) @@ -1778,7 +1805,7 @@ GEM unicode-display_width (>= 1.1.1, < 3) terser (1.0.2) execjs (>= 0.3.0, < 3) - test-prof (1.3.3) + test-prof (1.3.3.1) test_file_finder (0.3.1) faraday (>= 1.0, < 3.0, != 2.0.0) text (1.3.1) @@ -1827,15 +1854,16 @@ GEM tty-screen (~> 0.8) wisper (~> 2.0) tty-screen (0.8.1) - typhoeus (1.4.0) + typhoeus (1.4.1) ethon (>= 0.9.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) uber (0.1.0) - undercover (0.4.6) + undercover (0.5.0) + bigdecimal imagen (>= 0.1.8) rainbow (>= 2.1, < 4.0) - rugged (>= 0.27, < 1.7) + rugged (>= 0.27, < 1.8) unf (0.1.4) unf_ext unf_ext (0.0.8.2) @@ -1848,13 +1876,9 @@ GEM diff-lcs (~> 1.3) parser (>= 3.2.0) uri (0.13.0) - uri_template (0.7.0) valid_email (0.1.3) activemodel mail (>= 2.6.1) - validate_email (0.1.6) - activemodel (>= 3.0) - mail (>= 2.2.5) validate_url (1.0.15) activemodel (>= 3.0.0) public_suffix @@ -1863,7 +1887,7 @@ GEM activesupport (>= 3.0) version_gem (1.1.0) version_sorter (2.3.0) - view_component (3.12.1) + view_component (3.13.0) activesupport (>= 5.2.0, < 8.0) concurrent-ruby (~> 1.0) method_source (~> 1.0) @@ -1874,7 +1898,7 @@ GEM vite_rails (3.0.17) railties (>= 5.1, < 8) vite_ruby (~> 3.0, >= 3.2.2) - vite_ruby (3.5.0) + vite_ruby (3.7.0) dry-cli (>= 0.7, < 2) rack-proxy (~> 0.6, >= 0.6.1) zeitwerk (~> 2.2) @@ -1891,9 +1915,10 @@ GEM openssl (>= 2.2) safety_net_attestation (~> 0.4.0) tpm-key_attestation (~> 0.12.0) - webfinger (1.2.0) + webfinger (2.1.3) activesupport - httpclient (>= 2.4) + faraday (~> 2.0) + faraday-follow_redirects webmock (3.23.1) addressable (>= 2.8.0) crack (>= 0.3.2) @@ -1924,10 +1949,9 @@ PLATFORMS DEPENDENCIES CFPropertyList (~> 3.0.0) RedCloth (~> 4.3.3) - acme-client (~> 2.0) + acme-client (~> 2.0.18) activerecord-explain-analyze (~> 0.1) activerecord-gitlab! - acts-as-taggable-on (~> 10.0) addressable (~> 2.8) akismet (~> 3.0) apollo_upload_server (~> 2.1.6) @@ -1942,8 +1966,8 @@ DEPENDENCIES attr_encrypted (~> 3.2.4)! awesome_print aws-sdk-cloudformation (~> 1) - aws-sdk-core (~> 3.199.0) - aws-sdk-s3 (~> 1.154.0) + aws-sdk-core (~> 3.201.0) + aws-sdk-s3 (~> 1.157.0) axe-core-rspec (~> 4.9.0) babosa (~> 2.0) base32 (~> 0.3.0) @@ -1960,6 +1984,7 @@ DEPENDENCIES capybara (~> 3.40) capybara-screenshot (~> 1.0.26) carrierwave (~> 1.3) + charlock_holmes (~> 0.7.9) circuitbox (= 2.0.0) click_house-client! cloud_profiler_agent (~> 0.0.0)! @@ -1970,10 +1995,10 @@ DEPENDENCIES coverband (= 6.1.2) creole (~> 0.5.0) crystalball (~> 0.7.0) - cssbundling-rails (= 1.4.0) + cssbundling-rails (= 1.4.1) csv_builder! cvss-suite (~> 3.0.1) - database_cleaner-active_record (~> 2.1.0) + database_cleaner-active_record (~> 2.2.0) deckar01-task_list (= 2.3.4) declarative_policy (~> 1.1.0) deprecation_toolkit (~> 1.5.1) @@ -1991,15 +2016,18 @@ DEPENDENCIES doorkeeper-openid_connect (~> 1.8, >= 1.8.7) duo_api (~> 1.3) ed25519 (~> 1.3.0) - elasticsearch-api (= 7.13.3) + elasticsearch-api (= 7.17.11) elasticsearch-model (~> 7.2) elasticsearch-rails (~> 7.2) email_reply_trimmer (~> 0.1) email_spec (~> 2.2.0) error_tracking_open_api! factory_bot_rails (~> 6.4.3) - faraday (~> 1.10.3) - faraday_middleware-aws-sigv4 (~> 0.3.0) + faraday (~> 2) + faraday-multipart (~> 1.0) + faraday-retry (~> 2) + faraday-typhoeus (~> 1.1) + faraday_middleware-aws-sigv4 (~> 1.0.1) fast_blank (~> 1.0.1) ffaker (~> 2.23) flipper (~> 0.26.2) @@ -2015,12 +2043,13 @@ DEPENDENCIES gdk-toogle (~> 0.9, >= 0.9.5) gettext (~> 3.4, >= 3.4.9) gettext_i18n_rails (~> 1.12.0) - gitaly (~> 17.1.0) + gitaly (~> 17.2.0) gitlab-backup-cli! gitlab-chronic (~> 0.10.5) gitlab-dangerfiles (~> 4.8.0) + gitlab-duo-workflow-service-client (~> 0.1)! gitlab-experiment (~> 0.9.1) - gitlab-fog-azure-rm (~> 1.9.1) + gitlab-fog-azure-rm (~> 2.0.1) gitlab-glfm-markdown (~> 0.0.17) gitlab-housekeeper! gitlab-http! @@ -2037,10 +2066,11 @@ DEPENDENCIES gitlab-secret_detection! gitlab-sidekiq-fetcher! gitlab-styles (~> 12.0.1) + gitlab-topology-service-client (~> 0.1)! gitlab-utils! gitlab_chronic_duration (~> 0.12) gitlab_omniauth-ldap (~> 2.2.0) - gitlab_quality-test_tooling (~> 1.31.0) + gitlab_quality-test_tooling (~> 1.33.0) gon (~> 6.4.0) google-apis-androidpublisher_v3 (~> 0.34.0) google-apis-cloudbilling_v1 (~> 0.21.0) @@ -2066,11 +2096,11 @@ DEPENDENCIES grape-swagger-entity (~> 0.5.1) grape_logging (~> 1.8, >= 1.8.4) graphiql-rails (~> 1.10) - graphlient (~> 0.6.0) + graphlient (~> 0.8.0) graphlyte (~> 1.0.0) graphql (~> 2.3.5) graphql-docs (~> 5.0.0) - grpc (~> 1.63) + grpc (= 1.63.0) gssapi (~> 1.3.1) guard-rspec haml_lint (~> 0.58) @@ -2089,12 +2119,12 @@ DEPENDENCIES jira-ruby (~> 2.3.0) js_regex (~> 3.8) json (~> 2.7.2) - json_schemer (~> 0.2.18) + json_schemer (~> 2.3.0) jsonb_accessor (~> 1.3.10) jwt (~> 2.5) kaminari (~> 1.2.2) - kas-grpc (~> 0.5.0) - knapsack (~> 1.22.0) + kas-grpc (~> 0.6.0) + knapsack (~> 4.0.0) kramdown (~> 2.3.1) kubeclient (~> 4.11.0) lefthook (~> 1.6.8) @@ -2103,6 +2133,7 @@ DEPENDENCIES licensee (~> 9.16) listen (~> 3.7) lockbox (~> 1.3.0) + logger (~> 1.5.3) lograge (~> 0.5) loofah (~> 2.22.0) lookbook (~> 2.3) @@ -2139,8 +2170,9 @@ DEPENDENCIES omniauth-saml (~> 2.2.1) omniauth-shibboleth-redux (~> 2.0) omniauth_crowd (~> 2.4.0)! - omniauth_openid_connect (~> 0.6.1) - openid_connect (= 1.3.0) + omniauth_openid_connect (~> 0.8.0) + openbao_client! + openid_connect (~> 2.3.0) openssl (~> 3.0) opentelemetry-exporter-otlp opentelemetry-instrumentation-action_pack @@ -2184,7 +2216,7 @@ DEPENDENCIES rack (~> 2.2.9) rack-attack (~> 6.7.0) rack-cors (~> 2.0.1) - rack-oauth2 (~> 1.21.3) + rack-oauth2 (~> 2.2.1) rack-proxy (~> 0.7.7) rack-timeout (~> 0.7.0) rails (~> 7.0.8.4) @@ -2201,7 +2233,7 @@ DEPENDENCIES request_store (~> 1.5.1) responders (~> 3.0) retriable (~> 3.1.2) - rexml (~> 3.2.6) + rexml (~> 3.3.2) rouge (~> 4.3.0) rqrcode (~> 2.2) rspec-benchmark (~> 0.6.0) @@ -2226,9 +2258,9 @@ DEPENDENCIES seed-fu (~> 2.3.7) selenium-webdriver (~> 4.21, >= 4.21.1) semver_dialects (~> 3.0) - sentry-rails (~> 5.17.3) - sentry-ruby (~> 5.17.3) - sentry-sidekiq (~> 5.17.3) + sentry-rails (~> 5.18.0) + sentry-ruby (~> 5.18.0) + sentry-sidekiq (~> 5.18.0) shoulda-matchers (~> 5.1.0) sidekiq (~> 7.1.6) sidekiq-cron (~> 1.12.0) @@ -2247,9 +2279,8 @@ DEPENDENCIES sprockets (~> 3.7.0) sprockets-rails (~> 3.5.1) ssh_data (~> 1.3) - stackprof (~> 0.2.25) + stackprof (~> 0.2.26) state_machines-activerecord (~> 0.8.0) - static_holmes (~> 0.7.11) sys-filesystem (~> 1.4.3) tanuki_emoji (~> 0.9) telesignenterprise (~> 2.2) @@ -2262,14 +2293,14 @@ DEPENDENCIES truncato (~> 0.7.12) tty-prompt (~> 0.23) typhoeus (~> 1.4.0) - undercover (~> 0.4.4) + undercover (~> 0.5.0) unleash (~> 3.2.2) valid_email (~> 0.1) validates_hostname (~> 1.0.13) version_sorter (~> 2.3) - view_component (~> 3.12.1) + view_component (~> 3.13.0) vite_rails (~> 3.0.17) - vite_ruby (~> 3.5.0) + vite_ruby (~> 3.7.0) vmstat (~> 2.3.0) warning (~> 1.3.0) webauthn (~> 3.0) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 741336ca7211..d032f8bf0ba9 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -6,10 +6,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pl901hwqbx7sa058i006l7addvqg6wv73kkqsq3mgjx7jgxmxpd"; + sha256 = "0xgj5r8b7q242f3p9rr17v0q10dd9nx53gmscpmidz3gj90v7siz"; type = "gem"; }; - version = "2.0.11"; + version = "2.0.18"; }; actioncable = { dependencies = ["actionpack" "activesupport" "nio4r" "websocket-driver"]; @@ -153,17 +153,6 @@ src: }; version = "7.0.8.4"; }; - acts-as-taggable-on = { - dependencies = ["activerecord"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "10yvdqrmykjpfjchnbh7q85vm5fgz20g9ip5iwphl0922rpyjq6k"; - type = "gem"; - }; - version = "10.0.0"; - }; addressable = { dependencies = ["public_suffix"]; groups = ["danger" "default" "development" "test"]; @@ -349,10 +338,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g22axmi2rhhy7w8c3x6gppsawxqavbrnxpnmphh22fk7cwi0kh2"; + sha256 = "16fbwr6nmsn97n0a6k1nwbpyz08zpinhd6g7196lz1syndbgrszh"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.2"; }; awesome_print = { groups = ["development" "test"]; @@ -411,10 +400,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lb21zc9fax6c97dq17h7bllm2cg39ms6hi9ya9z88lsdz8sgnj6"; + sha256 = "0b7qc3pfhiv052fgw8dj4fj7fwm9rp7mc627ax2nkq5zbbbqs6sz"; type = "gem"; }; - version = "3.199.0"; + version = "3.201.4"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -433,10 +422,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "035d5q3csa1ac51xmxs2cqqibiifhm9sfdh71xjh0yrxnywdwqbh"; + sha256 = "1479h0jpjfkyj26h9hv8d6q8b9iw7v1x5yd0yk6af477d2icgq71"; type = "gem"; }; - version = "1.154.0"; + version = "1.157.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -482,28 +471,6 @@ src: }; version = "0.1.1"; }; - azure-storage-blob = { - dependencies = ["azure-storage-common" "nokogiri"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0qq3knsy7nj7a0r8m19spg2bgzns9b3j5vjbs9mpg49whhc63dv1"; - type = "gem"; - }; - version = "2.0.3"; - }; - azure-storage-common = { - dependencies = ["faraday" "faraday_middleware" "net-http-persistent" "nokogiri"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0swmsvvpmy8cdcl305p3dl2pi7m3dqjd7zywfcxmhsz0n2m4v3v0"; - type = "gem"; - }; - version = "2.0.4"; - }; babosa = { groups = ["default"]; platforms = []; @@ -673,10 +640,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1srlq3gqirzdkhv12ljpnp5cb0f8jfrl3n8xs9iivyz2c7khvdyp"; + sha256 = "0mdgj9yw1hmx3xh2qxyjc31y8igmxzd9h0c245ay2zkz76pl4k5c"; type = "gem"; }; - version = "1.18.3"; + version = "1.18.4"; }; browser = { groups = ["default"]; @@ -808,6 +775,16 @@ src: }; version = "1.8.0"; }; + charlock_holmes = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1c1dws56r7p8y363dhyikg7205z59a3bn4amnv2y488rrq8qm7ml"; + type = "gem"; + }; + version = "0.7.9"; + }; chef-config = { dependencies = ["addressable" "chef-utils" "fuzzyurl" "mixlib-config" "mixlib-shellout" "tomlrb"]; groups = ["default"]; @@ -1080,10 +1057,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nzp4j1ll6llgbrvqk81gkz6fqgk33sx4k1fcvbm7v7h79jk8808"; + sha256 = "1qbwdksjq9lw2h4xs2lb7lvp94pwgv38hp0mm46qj8bvc8yjf8ab"; type = "gem"; }; - version = "1.4.0"; + version = "1.4.1"; }; csv_builder = { groups = ["default"]; @@ -1132,10 +1109,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12hdsqnws9gyc9sxiyc8pjiwr0xa7136m1qbhmd1pk3vsrrvk13k"; + sha256 = "1iz1hv2b1z7509dxvxdwzay1hhs24glxls5ldbyh688zxkcdca1j"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; database_cleaner-core = { groups = ["default" "development" "test"]; @@ -1501,17 +1478,6 @@ src: }; version = "0.1.0"; }; - ecma-re-validator = { - dependencies = ["regexp_parser"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1mz0nsl2093jd94nygw8qs13rwfwl1ax76xz3ypinr5hqbc5pab6"; - type = "gem"; - }; - version = "0.3.0"; - }; ed25519 = { groups = ["default"]; platforms = []; @@ -1528,10 +1494,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0havyxmvl157a653prspnbhgdchlx44xqxl170v1im5ggxwavcaq"; + sha256 = "11pw5x7kg6f6m8rqy2kpbzdlnvijjpmbqkj2gz8237wkbl40y27d"; type = "gem"; }; - version = "7.13.3"; + version = "7.17.11"; }; elasticsearch-api = { dependencies = ["multi_json"]; @@ -1539,10 +1505,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bmssarkk7lqkjdn8c9j7jvxcnn4hg1zcmhsky8bfvc99k33b3w8"; + sha256 = "01wi43a3zylrq2vca08vir5va142g5m3jcsak3rprjck8jvggn7y"; type = "gem"; }; - version = "7.13.3"; + version = "7.17.11"; }; elasticsearch-model = { dependencies = ["activesupport" "elasticsearch" "hashie"]; @@ -1550,10 +1516,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ivcz5pcrp0760j26590bm3jvwc8548wcy7z7v2274k18l583h9c"; + sha256 = "02x2wvd22wwi2v6pps7y4advzkyfbhxn0fgsai49zcjbcrblnp4b"; type = "gem"; }; - version = "7.2.0"; + version = "7.2.1"; }; elasticsearch-rails = { groups = ["default"]; @@ -1566,15 +1532,15 @@ src: version = "7.2.1"; }; elasticsearch-transport = { - dependencies = ["faraday" "multi_json"]; + dependencies = ["base64" "faraday" "multi_json"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0blfii8qvj0m6bg9sbfynxc40in7zfmw2wpi4clv7d9gclk053db"; + sha256 = "00qgyyvjyyv7z22qjd408pby1h7902gdwkh8h3z3jk2y57amg06i"; type = "gem"; }; - version = "7.13.3"; + version = "7.17.11"; }; email_reply_trimmer = { groups = ["default"]; @@ -1597,6 +1563,17 @@ src: }; version = "2.2.0"; }; + email_validator = { + dependencies = ["activemodel"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0106y8xakq6frv2xc68zz76q2l2cqvhfjc7ji69yyypcbc4kicjs"; + type = "gem"; + }; + version = "2.2.4"; + }; encryptor = { groups = ["default"]; platforms = []; @@ -1734,45 +1711,26 @@ src: version = "6.4.3"; }; faraday = { - dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"]; + dependencies = ["faraday-net_http" "logger"]; groups = ["danger" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c760q0ks4vj4wmaa7nh1dgvgqiwaw0mjr7v8cymy7i3ffgjxx90"; + sha256 = "104s7n9505488p923cs0pl3jlgn4naam28clkm2885hrysizpjbb"; type = "gem"; }; - version = "1.10.3"; + version = "2.10.1"; }; - faraday-em_http = { - groups = ["danger" "default" "development" "test"]; + faraday-follow_redirects = { + dependencies = ["faraday"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12cnqpbak4vhikrh2cdn94assh3yxza8rq2p9w2j34bqg5q4qgbs"; + sha256 = "1y87p3yk15bjbk0z9mf01r50lzxvp7agr56lbm9gxiz26mb9fbfr"; type = "gem"; }; - version = "1.0.0"; - }; - faraday-em_synchrony = { - groups = ["danger" "default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6"; - type = "gem"; - }; - version = "1.0.0"; - }; - faraday-excon = { - groups = ["danger" "default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh"; - type = "gem"; - }; - version = "1.1.0"; + version = "0.3.0"; }; faraday-http-cache = { dependencies = ["faraday"]; @@ -1785,16 +1743,6 @@ src: }; version = "2.5.0"; }; - faraday-httpclient = { - groups = ["danger" "default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc"; - type = "gem"; - }; - version = "1.0.1"; - }; faraday-multipart = { dependencies = ["multipart-post"]; groups = ["danger" "default" "development" "test"]; @@ -1807,65 +1755,48 @@ src: version = "1.0.4"; }; faraday-net_http = { + dependencies = ["net-http"]; groups = ["danger" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; + sha256 = "17w51yk4rrm9rpnbc3x509s619kba0jga3qrj4b17l30950vw9qn"; type = "gem"; }; - version = "1.0.1"; + version = "3.1.0"; }; faraday-net_http_persistent = { - groups = ["danger" "default" "development" "test"]; + dependencies = ["faraday" "net-http-persistent"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b"; + sha256 = "02yydasm9qlq59dnj3dldaqd0xidxyx59pnr2iqygnjn7yqj05xl"; type = "gem"; }; - version = "1.2.0"; - }; - faraday-patron = { - groups = ["danger" "default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w"; - type = "gem"; - }; - version = "1.0.0"; - }; - faraday-rack = { - groups = ["danger" "default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1h184g4vqql5jv9s9im6igy00jp6mrah2h14py6mpf9bkabfqq7g"; - type = "gem"; - }; - version = "1.0.0"; + version = "2.1.0"; }; faraday-retry = { - groups = ["danger" "default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd"; - type = "gem"; - }; - version = "1.0.3"; - }; - faraday_middleware = { dependencies = ["faraday"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bw8mfh4yin2xk7138rg3fhb2p5g2dlmdma88k82psah9mbmvlfy"; + sha256 = "023ncwlagnf2irx2ckyj1pg1f1x436jgr4a5y45mih298p8zwij1"; type = "gem"; }; - version = "1.2.0"; + version = "2.2.1"; + }; + faraday-typhoeus = { + dependencies = ["faraday" "typhoeus"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rwhd2f78vqj0wkkdah395apx6igp5xf82n5xgixs61q45y19ii4"; + type = "gem"; + }; + version = "1.1.0"; }; faraday_middleware-aws-sigv4 = { dependencies = ["aws-sigv4" "faraday"]; @@ -1873,10 +1804,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gk2qakcvvbgfvvfd8cgf13sligv5mp816ykmra9llqmbfym8ikl"; + sha256 = "13xym8pfjh1j2pf63r45ybdy6p4hjrqn4algml5wd8bwd17yl0d0"; type = "gem"; }; - version = "0.3.0"; + version = "1.0.1"; }; fast_blank = { groups = ["default"]; @@ -2225,10 +2156,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0prcxb5ahqpxdswg2957d24k6w74rlnm0x7qlv5p0dr4qzp51x6y"; + sha256 = "0rg8rkwjbm51kvnbmkmy6dyf7krr6iaf8hxvxn7jzfs37j4fivj8"; type = "gem"; }; - version = "17.1.2"; + version = "17.2.0"; }; gitlab = { dependencies = ["httparty" "terminal-table"]; @@ -2242,7 +2173,7 @@ src: version = "4.19.0"; }; gitlab-backup-cli = { - dependencies = ["activesupport" "rainbow" "thor"]; + dependencies = ["activesupport" "google-cloud-storage_transfer" "googleauth" "rainbow" "thor"]; groups = ["default"]; platforms = []; source = { @@ -2273,6 +2204,16 @@ src: }; version = "4.8.0"; }; + gitlab-duo-workflow-service-client = { + dependencies = ["grpc"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/vendor/gems/gitlab-duo-workflow-service-client"; + type = "path"; + }; + version = "0.1"; + }; gitlab-experiment = { dependencies = ["activesupport" "request_store"]; groups = ["default"]; @@ -2285,15 +2226,15 @@ src: version = "0.9.1"; }; gitlab-fog-azure-rm = { - dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types"]; + dependencies = ["faraday" "faraday-follow_redirects" "faraday-net_http_persistent" "fog-core" "fog-json" "mime-types" "net-http-persistent" "nokogiri"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dsg53f6gfhf9rs6wslragagl3ysi429p45iy4dkq664i8c8wsq2"; + sha256 = "09brm889i4xmr2ba8jyqk91yhya13qfa0kn16p3ipilcm6gh9k31"; type = "gem"; }; - version = "1.9.1"; + version = "2.0.1"; }; gitlab-glfm-markdown = { dependencies = ["rb_sys"]; @@ -2460,6 +2401,16 @@ src: }; version = "12.0.1"; }; + gitlab-topology-service-client = { + dependencies = ["grpc"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/vendor/gems/gitlab-topology-service-client"; + type = "path"; + }; + version = "0.1"; + }; gitlab-utils = { dependencies = ["actionview" "activesupport" "addressable" "rake"]; groups = ["monorepo"]; @@ -2498,10 +2449,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ljg28wf9vmi6bc639fcf19abx5i4a3h04bjvdwr2ih1pbr3hgf1"; + sha256 = "0dfsv3aqfmq318dirln6nlmxx8n1z4ncy03w2yi965nm2rwjf58y"; type = "gem"; }; - version = "1.31.0"; + version = "1.33.0"; }; globalid = { dependencies = ["activesupport"]; @@ -2788,15 +2739,37 @@ src: }; version = "1.45.0"; }; + google-cloud-storage_transfer = { + dependencies = ["google-cloud-core" "google-cloud-storage_transfer-v1"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0n0nxy4l2kzcmcgx7j8mppyw9gwc8331fqcf6w6jmq4913sh2a8k"; + type = "gem"; + }; + version = "1.2.0"; + }; + google-cloud-storage_transfer-v1 = { + dependencies = ["gapic-common" "google-cloud-errors"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xk1i7wg5alcgd9v4f0y3mjgxbsrcp53jhdjdc26wmfvfl1giglx"; + type = "gem"; + }; + version = "0.8.0"; + }; google-protobuf = { groups = ["default" "development" "opentelemetry" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mnxzcq8kmyfb9bkzqnp019d1hx1vprip3yzdkkha6b3qz5rgg9r"; + sha256 = "03pg19m15aqw33q6an777735x4x8643xg17rb3jr9j4rkp599id1"; type = "gem"; }; - version = "3.25.3"; + version = "3.25.4"; }; googleapis-common-protos = { dependencies = ["google-protobuf" "googleapis-common-protos-types" "grpc"]; @@ -2920,15 +2893,15 @@ src: version = "1.10.0"; }; graphlient = { - dependencies = ["faraday" "faraday_middleware" "graphql-client"]; + dependencies = ["faraday" "graphql-client"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h652p91zdbdigb155vhdlh0lnq4ia8wlg5y5h0ibhlf9i5ndn5q"; + sha256 = "1cbwirpx8hclxyrxfbjz5c62l7i6nsqg6x72yplm8d083pd0ii4q"; type = "gem"; }; - version = "0.6.0"; + version = "0.8.0"; }; graphlyte = { groups = ["test"]; @@ -3416,26 +3389,26 @@ src: version = "2.7.2"; }; json-jwt = { - dependencies = ["activesupport" "aes_key_wrap" "bindata" "httpclient"]; + dependencies = ["activesupport" "aes_key_wrap" "base64" "bindata" "faraday" "faraday-follow_redirects"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04315mf4p9qa97grdfqv922paghzdfrbb982ap0p99rqwla4znv6"; + sha256 = "0v16kd05ijdmw1q8avpfsjkdiha6c2070hbz2g2fqg3lv2f1yidb"; type = "gem"; }; - version = "1.15.3"; + version = "1.16.6"; }; json_schemer = { - dependencies = ["ecma-re-validator" "hana" "regexp_parser" "uri_template"]; + dependencies = ["bigdecimal" "hana" "regexp_parser" "simpleidn"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rkb7gz819g82n3xshb5g8kgv1nvgwg1lm2fk7715pggzcgc4qik"; + sha256 = "0dgbrps0ydiyxcgj5n4dny0cmzwj125x1s792l7m5jjrp1rs27wz"; type = "gem"; }; - version = "0.2.18"; + version = "2.3.0"; }; jsonb_accessor = { dependencies = ["activerecord" "activesupport" "pg"]; @@ -3518,10 +3491,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dffbnw10hld4vpack6xw14n590b9fgqv5cxgap3f7qzzdd6yybc"; + sha256 = "0ydgam2c0c43wpzziz3hxif2xwj8nsdniqd4dilxal2xyi63dxs3"; type = "gem"; }; - version = "0.5.0"; + version = "0.6.0"; }; knapsack = { dependencies = ["rake"]; @@ -3529,10 +3502,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jqs9shqg3nd6j3kzbh8gxv7ix1n877y64kdjzbrwjgz6ksqs9mx"; + sha256 = "1f42akjbdkrg1ihwvls9pkkvz8vikaapzgxl82dd128rfn42chm9"; type = "gem"; }; - version = "1.22.0"; + version = "4.0.0"; }; kramdown = { dependencies = ["rexml"]; @@ -3695,14 +3668,14 @@ src: version = "1.3.0"; }; logger = { - groups = ["default" "development"]; + groups = ["danger" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gpg8gzi0xwymw4aaq2iafcbx31i3xzkg3fb30mdxn1d4qhc3dqa"; + sha256 = "0yyn64c92wx8c37dqh1b080rqc80idq56g2plfqls9f9q8l32i7d"; type = "gem"; }; - version = "1.6.0"; + version = "1.5.3"; }; lograge = { dependencies = ["actionpack" "activesupport" "railties" "request_store"]; @@ -4460,10 +4433,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08yl0x203k6nrshc70zawfqh79ap1c3fyka9zwwy61cvn7sih4sz"; + sha256 = "099xg7s6450wlfzs77mbdx78g3dp0glx5q6f44i78akf7283hbqz"; type = "gem"; }; - version = "0.6.1"; + version = "0.8.0"; }; open4 = { groups = ["default" "development"]; @@ -4475,26 +4448,36 @@ src: }; version = "1.3.4"; }; + openbao_client = { + dependencies = ["typhoeus"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/gems/openbao_client"; + type = "path"; + }; + version = "1.0.0"; + }; openid_connect = { - dependencies = ["activemodel" "attr_required" "json-jwt" "rack-oauth2" "swd" "tzinfo" "validate_email" "validate_url" "webfinger"]; + dependencies = ["activemodel" "attr_required" "email_validator" "faraday" "faraday-follow_redirects" "json-jwt" "mail" "rack-oauth2" "swd" "tzinfo" "validate_url" "webfinger"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w474bz3s1hqhilvrddr33l2nkyikypaczp3808w0345jr88b5m7"; + sha256 = "0k3l4ak1mawrw74qy4xfh81hdfxvamijcjb3f1gadq0ixgprrfqd"; type = "gem"; }; - version = "1.3.0"; + version = "2.3.0"; }; openssl = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c649921vg2l939z5cc3jwd8p1v49099pdhxfk7sb9qqx5wi5873"; + sha256 = "054d6ybgjdzxw567m7rbnd46yp6gkdbc5ihr536vxd3p15vbhjrw"; type = "gem"; }; - version = "3.1.0"; + version = "3.2.0"; }; openssl-signature_algorithm = { dependencies = ["openssl"]; @@ -4550,6 +4533,17 @@ src: }; version = "0.1.0"; }; + opentelemetry-instrumentation-action_mailer = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-active_support" "opentelemetry-instrumentation-base"]; + groups = ["default" "opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1afibmwprdiqnkin7lb6zdxng36rqa7qbl5fl9wx0lchpc039zjj"; + type = "gem"; + }; + version = "0.1.0"; + }; opentelemetry-instrumentation-action_pack = { dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base" "opentelemetry-instrumentation-rack"]; groups = ["opentelemetry"]; @@ -4749,15 +4743,15 @@ src: version = "0.24.4"; }; opentelemetry-instrumentation-rails = { - dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-action_pack" "opentelemetry-instrumentation-action_view" "opentelemetry-instrumentation-active_job" "opentelemetry-instrumentation-active_record" "opentelemetry-instrumentation-active_support" "opentelemetry-instrumentation-base"]; + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-action_mailer" "opentelemetry-instrumentation-action_pack" "opentelemetry-instrumentation-action_view" "opentelemetry-instrumentation-active_job" "opentelemetry-instrumentation-active_record" "opentelemetry-instrumentation-active_support" "opentelemetry-instrumentation-base"]; groups = ["opentelemetry"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hiihby0lndwvny1alba1mvvag48z55vjjrwbjppb700prv0q1kk"; + sha256 = "04isc412xin2xw11lccdxcg7i2yf4m8jsw9jlq7gcld5mwix1pa2"; type = "gem"; }; - version = "0.30.1"; + version = "0.30.2"; }; opentelemetry-instrumentation-rake = { dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; @@ -5218,15 +5212,15 @@ src: version = "2.0.2"; }; rack-oauth2 = { - dependencies = ["activesupport" "attr_required" "httpclient" "json-jwt" "rack"]; + dependencies = ["activesupport" "attr_required" "faraday" "faraday-follow_redirects" "json-jwt" "rack"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fknwsxz4429w1hndl6y30cmm2n34wmmaaj2hhp6jrm8ssfsfwjf"; + sha256 = "19fi42hi9l474ki89y6cs8vrpfmc1h8zpd02iwjy4hw0a1yahfn7"; type = "gem"; }; - version = "1.21.3"; + version = "2.2.1"; }; rack-protection = { dependencies = ["rack"]; @@ -5566,10 +5560,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17mhr1g3lmacrgjndbmrklngy32g55165n53111q70kykx7qjn7j"; + sha256 = "197d1088jw3wl3lfcdj4w4c4da13wsqyd12mj3czvlfw77ig7i7d"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.0"; }; regexp_parser = { groups = ["default" "development" "test"]; @@ -5657,14 +5651,15 @@ src: version = "1.4.0"; }; rexml = { + dependencies = ["strscan"]; groups = ["coverage" "danger" "default" "development" "omnibus" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; + sha256 = "0zr5qpa8lampaqzhdcjcvyqnrqcjl7439mqjlkjz43wdhmpnh4s5"; type = "gem"; }; - version = "3.2.6"; + version = "3.3.2"; }; rinku = { groups = ["default"]; @@ -5975,10 +5970,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w4vvhy8nyffj7bp17842kg6szhfz27w8pni0a7haam78hb86b1r"; + sha256 = "0xd9d1h7m0bw05jykf0sx6sds01ymf0dffpb3j1r99ril703lzc4"; type = "gem"; }; - version = "0.3.7"; + version = "0.3.8"; }; ruby-lsp-rspec = { dependencies = ["ruby-lsp"]; @@ -6181,15 +6176,15 @@ src: version = "2.3.7"; }; selenium-webdriver = { - dependencies = ["base64" "rexml" "rubyzip" "websocket"]; + dependencies = ["base64" "logger" "rexml" "rubyzip" "websocket"]; groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qrjr30qs01b27km6ipzc2zasdlzhdgri5q7qrb53z1j8l0n82y3"; + sha256 = "00dq3450kadsvxh1lpndasy0bab0ilrjhrnvlicfmkvrx3gfs2j9"; type = "gem"; }; - version = "4.21.1"; + version = "4.23.0"; }; semver_dialects = { dependencies = ["deb_version" "pastel" "thor" "tty-command"]; @@ -6197,10 +6192,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ndbdsac42sl6ldh6jji7k0agc85v6d28wfd3jb3awyl7hsgs9cn"; + sha256 = "10ncp5pl9jsm81kj89gwyhsilbqhgh0j2cfz66q3ls86g2gsjgmf"; type = "gem"; }; - version = "3.4.0"; + version = "3.4.3"; }; sentry-rails = { dependencies = ["railties" "sentry-ruby"]; @@ -6208,10 +6203,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ncl8br0k6fas4n6c4xw4wr59kq5s2liqn1s4790m73k5p272xq1"; + sha256 = "09qfh3pgjg92cjsn83zkp1vc234gm2j66rld09lfhlviavkzdbad"; type = "gem"; }; - version = "5.17.3"; + version = "5.18.2"; }; sentry-ruby = { dependencies = ["bigdecimal" "concurrent-ruby"]; @@ -6219,10 +6214,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z5v5zzasy04hbgxbj9n8bb39ayllvps3snfgbc5rydh1d5ilyb1"; + sha256 = "168dq5i95aaps8bppc402qgd8xpxisdpx9z4cqr3zcn6s0dwn9fz"; type = "gem"; }; - version = "5.17.3"; + version = "5.18.2"; }; sentry-sidekiq = { dependencies = ["sentry-ruby" "sidekiq"]; @@ -6230,10 +6225,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n1cr9g15hp08jsqabprd6q34ap61r71f33x28w1xr4ri4hllwfh"; + sha256 = "0qajyyiwd035rwnxd2zdhh9y2rdx00812ya247nhqb6kqw1s7ml6"; type = "gem"; }; - version = "5.17.3"; + version = "5.18.2"; }; sexp_processor = { groups = ["default" "test"]; @@ -6371,6 +6366,16 @@ src: }; version = "0.1.4"; }; + simpleidn = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0a9c1mdy12y81ck7mcn9f9i2s2wwzjh1nr92ps354q517zq9dkh8"; + type = "gem"; + }; + version = "0.2.3"; + }; singleton = { groups = ["default" "development"]; platforms = []; @@ -6533,10 +6538,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bhdgfb0pmw9mav1kw9fn0ka012sa0i3h5ppvqssw5xq48nhxnr8"; + sha256 = "1gdqqwnampxmc54nf6zfy9apkmkpdavzipvfssmjlhnrrjy8qh7f"; type = "gem"; }; - version = "0.2.25"; + version = "0.2.26"; }; state_machines = { groups = ["default"]; @@ -6570,16 +6575,6 @@ src: }; version = "0.8.0"; }; - static_holmes = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1frj0w4bmqpih40sxxig3055rm2ijnw6jkdvnbh5crlq6pnv6p63"; - type = "gem"; - }; - version = "0.7.11"; - }; strings = { dependencies = ["strings-ansi" "unicode-display_width" "unicode_utils"]; groups = ["default" "development" "test"]; @@ -6601,16 +6596,26 @@ src: }; version = "0.2.0"; }; + strscan = { + groups = ["coverage" "danger" "default" "development" "omnibus" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01"; + type = "gem"; + }; + version = "3.1.0"; + }; swd = { - dependencies = ["activesupport" "attr_required" "httpclient"]; + dependencies = ["activesupport" "attr_required" "faraday" "faraday-follow_redirects"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12b3q2sw42nnilfb51nlqdv07f31vdv2j595kd99asnkw4cjlf5w"; + sha256 = "0m86fzmwgw0vc8p6fwvnsdbldpgbqdz9cbp2zj9z06bc4jjf5nsc"; type = "gem"; }; - version = "1.3.0"; + version = "2.0.3"; }; sync = { groups = ["default" "development" "test"]; @@ -6733,10 +6738,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rwnq67qm2ngz066sncvg0dv65bsk29qz3xarbv8qan2hi7yw0qg"; + sha256 = "0lxik4ngvbphivyhss9i59c67zxkc0z7k0r683qshw1gdkfxzd8f"; type = "gem"; }; - version = "1.3.3"; + version = "1.3.3.1"; }; test_file_finder = { dependencies = ["faraday"]; @@ -6974,10 +6979,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m22yrkmbj81rzhlny81j427qdvz57yk5wbcf3km0nf3bl6qiygz"; + sha256 = "0z7gamf6s83wy0yqms3bi4srirn3fc0lc7n65lqanidxcj1xn5qw"; type = "gem"; }; - version = "1.4.0"; + version = "1.4.1"; }; tzinfo = { dependencies = ["concurrent-ruby"]; @@ -7001,15 +7006,15 @@ src: version = "0.1.0"; }; undercover = { - dependencies = ["imagen" "rainbow" "rugged"]; + dependencies = ["bigdecimal" "imagen" "rainbow" "rugged"]; groups = ["coverage" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bp644b1mxwhbkjlm8bmwv8sxkkwkpc7chqxff9a8yxy0n99ambj"; + sha256 = "1blz21yzd3s2ax75lnhlf4gvh273k9jry6fd7yqnyip5id3si6gg"; type = "gem"; }; - version = "0.4.6"; + version = "0.5.0"; }; unf = { dependencies = ["unf_ext"]; @@ -7094,16 +7099,6 @@ src: }; version = "0.13.0"; }; - uri_template = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0p8qbxlpmg3msw0ihny6a3gsn0yvydx9ksh5knn8dnq06zhqyb1i"; - type = "gem"; - }; - version = "0.7.0"; - }; valid_email = { dependencies = ["activemodel" "mail"]; groups = ["default"]; @@ -7115,17 +7110,6 @@ src: }; version = "0.1.3"; }; - validate_email = { - dependencies = ["activemodel" "mail"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1r1fz29l699arka177c9xw7409d1a3ff95bf7a6pmc97slb91zlx"; - type = "gem"; - }; - version = "0.1.6"; - }; validate_url = { dependencies = ["activemodel" "public_suffix"]; groups = ["default"]; @@ -7174,10 +7158,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12xi88jvx49p15nx2168wm0r00g90mb4cxzzsjxz92akjk92mkpj"; + sha256 = "0yqq8srliv2w960gxnfr5sn8dmcppcyd6wmkgq71d1qkymwn8vii"; type = "gem"; }; - version = "3.12.1"; + version = "3.13.0"; }; virtus = { dependencies = ["axiom-types" "coercible" "descendants_tracker"]; @@ -7207,10 +7191,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wza7pnwz8ym92gw0x4zr1icialhlw0l032kn4f86vw1vlzxmrd3"; + sha256 = "0fgpwlvmasj10kx5929xyb4fysqlfb3iixbci68170k6bslssd2a"; type = "gem"; }; - version = "3.5.0"; + version = "3.7.0"; }; vmstat = { groups = ["default"]; @@ -7255,15 +7239,15 @@ src: version = "3.0.0"; }; webfinger = { - dependencies = ["activesupport" "httpclient"]; + dependencies = ["activesupport" "faraday" "faraday-follow_redirects"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18jj50b44a471ig7hw1ax90wxaaz40acmrf6cm7m2iyshlffy53q"; + sha256 = "0p39802sfnm62r4x5hai8vn6d1wqbxsxnmbynsk8rcvzwyym4yjn"; type = "gem"; }; - version = "1.2.0"; + version = "2.1.3"; }; webmock = { dependencies = ["addressable" "crack" "hashdiff"]; From 99960e8654b656b7f488274f20e0a6020f3573bb Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Thu, 24 Oct 2024 11:05:49 +0200 Subject: [PATCH 03/11] gitaly: Embed git binaries gitaly now embeds git binaries in itself during the build https://gitlab.com/gitlab-org/gitaly/-/blob/10fd91391a7c30ca54ec81eea881740cfdee8b0a/packed_binaries.go#L22 These are meant to be built by the `Makefile` target `install-bundled-git` but this produces binaries with different names, and we're also referring to this version of git throughout the NixOS module, so we hack this by copying over the binaries from the deprecated `git` target with which we're building gitaly-git. (cherry picked from commit b5315bf732a6dbf3f4c915271772e9847dfa2291) --- pkgs/applications/version-management/gitlab/gitaly/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index f6ba224d4b1c..4804b926f4f7 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -47,6 +47,9 @@ buildGoModule ({ preConfigure = '' mkdir -p _build/bin cp -r ${auxBins}/bin/* _build/bin + for f in ${git}/bin/git-*; do + cp "$f" "_build/bin/gitaly-$(basename $f)"; + done ''; outputs = [ "out" ]; From 98df381dd3d2c4f0494cd037059a41f1dfe99689 Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Tue, 29 Oct 2024 19:58:14 +0100 Subject: [PATCH 04/11] floorp: 11.19.1 -> 11.20.0 Release notes: https://blog.ablaze.one/4556/2024-10-09/ Git changelog: https://github.com/Floorp-Projects/Floorp/compare/v11.19.1...v11.20.0 Signed-off-by: Christoph Heiss --- pkgs/applications/networking/browsers/floorp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix index 04448618d303..c8855270ab81 100644 --- a/pkgs/applications/networking/browsers/floorp/default.nix +++ b/pkgs/applications/networking/browsers/floorp/default.nix @@ -9,7 +9,7 @@ ((buildMozillaMach rec { pname = "floorp"; - packageVersion = "11.19.1"; + packageVersion = "11.20.0"; applicationName = "Floorp"; binaryName = "floorp"; branding = "browser/branding/official"; @@ -17,14 +17,14 @@ allowAddonSideload = true; # Must match the contents of `browser/config/version.txt` in the source tree - version = "128.4.0"; + version = "128.5.0"; src = fetchFromGitHub { owner = "Floorp-Projects"; repo = "Floorp"; fetchSubmodules = true; rev = "v${packageVersion}"; - hash = "sha256-RFJ3aRbLwCf0qaluqImcF9+6frvJbw8QE3jBpxNxFjE="; + hash = "sha256-+FVnG8CKEQdFN9bO8rUZadp+d8keCB98T7qt9OBfLDA="; }; extraConfigureFlags = [ From f4f141733d03fcd92877f0b8b45e4a1cdd1936eb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 8 Jul 2024 12:31:09 +0000 Subject: [PATCH 05/11] nifi: 1.26.0 -> 1.27.0 (cherry picked from commit e1ee0bf4830ea9aee583659de2d9869cf54f9ae3) --- pkgs/servers/web-apps/nifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/nifi/default.nix b/pkgs/servers/web-apps/nifi/default.nix index e579303bcfd2..3a65cb0fecfa 100644 --- a/pkgs/servers/web-apps/nifi/default.nix +++ b/pkgs/servers/web-apps/nifi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nifi"; - version = "1.26.0"; + version = "1.27.0"; src = fetchzip { url = "mirror://apache/nifi/${version}/nifi-${version}-bin.zip"; - hash = "sha256-V/XrggYDeitsDmdvwnXK5QIBGDDBmK4mToz1RphkbSk="; + hash = "sha256-D3o7MLn8vdDqzk6/AJ7Lmq6Yx2swy8CwOyDTlxFSVME="; }; nativeBuildInputs = [ makeWrapper ]; From 7e501f7582a2f02a66203fa7d0f6f6922025751b Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Mon, 28 Oct 2024 22:13:02 +0100 Subject: [PATCH 06/11] nifi: 1.27.0 -> 1.28.0 Fixes CVE-2024-45477 Relevant commit: https://github.com/apache/nifi/commit/153c87a7daaeebea9b119066285b840ea4056e09 Announcement: https://www.openwall.com/lists/oss-security/2024/10/28/1 Changes: https://github.com/apache/nifi/compare/rel/nifi-1.27.0...rel/nifi-1.28.0 Signed-off-by: Sefa Eyeoglu (cherry picked from commit d7bf46fed1417df9ce9e1d86deb4e3af35d1ff3d) --- pkgs/servers/web-apps/nifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/nifi/default.nix b/pkgs/servers/web-apps/nifi/default.nix index 3a65cb0fecfa..480b101098ac 100644 --- a/pkgs/servers/web-apps/nifi/default.nix +++ b/pkgs/servers/web-apps/nifi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nifi"; - version = "1.27.0"; + version = "1.28.0"; src = fetchzip { url = "mirror://apache/nifi/${version}/nifi-${version}-bin.zip"; - hash = "sha256-D3o7MLn8vdDqzk6/AJ7Lmq6Yx2swy8CwOyDTlxFSVME="; + hash = "sha256-EQqosdwNdaSUIcP3QlvzJZhDNu1JbHg08FlnZo6ogmQ="; }; nativeBuildInputs = [ makeWrapper ]; From 4505fb5fbee1453dd6204d2bf3c1b67f7bffec77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Wed, 30 Oct 2024 17:10:33 +0100 Subject: [PATCH 07/11] mullvad-browser: 13.5.7 -> 13.5.9 https://github.com/mullvad/mullvad-browser/releases/tag/13.5.9 (cherry picked from commit d78e3fa321d24e60480b2c7ae7244ee12a0be37a) --- pkgs/by-name/mu/mullvad-browser/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mu/mullvad-browser/package.nix b/pkgs/by-name/mu/mullvad-browser/package.nix index 46266fb9648c..d75f3d72a2dc 100644 --- a/pkgs/by-name/mu/mullvad-browser/package.nix +++ b/pkgs/by-name/mu/mullvad-browser/package.nix @@ -90,7 +90,7 @@ let ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "13.5.7"; + version = "13.5.9"; sources = { x86_64-linux = fetchurl { @@ -102,7 +102,7 @@ let "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-Te6Cw3fUs4XGz07lL54bKUU9HYC5soaKFlbWGujd/oU="; + hash = "sha256-hyFYI42IfFY0vqkqInkLQAWSY8flsmWGN8CaXBwXbGA="; }; }; From fd9a9c498a292677ce3a28c4d37f76ad6e49594e Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Thu, 31 Oct 2024 01:20:26 +0100 Subject: [PATCH 08/11] qbittorrent: add knownVulnerabilities Signed-off-by: Sefa Eyeoglu --- pkgs/applications/networking/p2p/qbittorrent/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 07c4ca3392f9..a8dbaedef058 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -96,5 +96,8 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ Anton-Latukha kashw2 ]; + knownVulnerabilities = [ + "Potential Remote Code Execution https://www.openwall.com/lists/oss-security/2024/10/30/4" + ]; }; } From 591df381f5454005c931aaf5e240abc486f53f28 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 29 Oct 2024 14:35:36 -0600 Subject: [PATCH 09/11] matrix-synapse-unwrapped: 1.117.0 -> 1.118.0 https://github.com/element-hq/synapse/releases/tag/v1.118.0 Signed-off-by: Sumner Evans (cherry picked from commit 60292408324c378aa860843ebedee44001c6e59a) --- pkgs/servers/matrix-synapse/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 299517ac1a71..916fb911ee4a 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -17,20 +17,20 @@ let in python3.pkgs.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.117.0"; + version = "1.118.0"; format = "pyproject"; src = fetchFromGitHub { owner = "element-hq"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-fBxvEHkLo736Qp973XeXXG84MuZHOZfBHjKbcJpmtJw="; + hash = "sha256-dMa1L1MYzt/XfCD8hGt+WupAwl5l4zwVcj5mQ8KtTp8="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-Wqpt42dubiECMPfijtb8EcsKDTsVKseZ8f6VP7QBpoo="; + hash = "sha256-FJaj5T2wMIn/A0JNUGpXyNtPvXIAF8Ivkej4vS1S3dA="; }; postPatch = '' From c3e63d6bc0a648b4075e670012bc62489ded4c70 Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Mon, 28 Oct 2024 20:16:21 +0100 Subject: [PATCH 10/11] epson-escpr2: 1.2.18 -> 1.2.20 (cherry picked from commit 1d0373d5ef7449a651f132e3130cc13097a25989) --- pkgs/misc/drivers/epson-escpr2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix index 4e213a0b4c21..75dd729f86db 100644 --- a/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/pkgs/misc/drivers/epson-escpr2/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; - version = "1.2.18"; + version = "1.2.20"; src = fetchurl { # To find the most recent version go to # https://support.epson.net/linux/Printer/LSB_distribution_pages/en/escpr2.php # and retreive the download link for source package for x86 CPU - url = "https://download3.ebz.epson.net/dsc/f/03/00/16/25/39/fcf17405f25e851f3ee0e5ed3ce97d09f22ecb41/epson-inkjet-printer-escpr2-1.2.18-1.src.rpm"; - sha256 = "sha256-cdCcZzi31jPGmMnlKtPCFVla0YWfrCTbXsXHSeB0Vk4="; + url = "https://download3.ebz.epson.net/dsc/f/03/00/16/35/74/81cbf34af8c0fa4c59b4c1f4600173dfda822ee4/epson-inkjet-printer-escpr2-1.2.20-1.src.rpm"; + sha256 = "sha256-HBKAcHVOV+xO6IpFS1EyYyn4Ri4e5btBp/e50f3RoTA="; }; unpackPhase = '' From 2cf8505dcc63e0db2b88841d59b3e827aaeb1e87 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2024 15:51:14 +0100 Subject: [PATCH 11/11] [Backport release-24.05] rustdesk-flutter: 1.3.1 -> 1.3.2 (#352520) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit rustdesk-flutter: 1.3.1 -> 1.3.2 (cherry picked from commit 28f451d3161981d595e663fb0da78ad388ead7a4) Co-authored-by: Janne Heß --- pkgs/by-name/ru/rustdesk-flutter/Cargo.lock | 8 ++++---- pkgs/by-name/ru/rustdesk-flutter/package.nix | 18 +++++++++--------- .../ru/rustdesk-flutter/pubspec.lock.json | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock b/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock index 406c1525a8f8..fb924be286cf 100644 --- a/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock +++ b/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock @@ -3043,7 +3043,7 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hwcodec" version = "0.7.0" -source = "git+https://github.com/rustdesk-org/hwcodec#f74410edec91435252b8394c38f8eeca87ad2a26" +source = "git+https://github.com/rustdesk-org/hwcodec#8bbd05bb300ad07cc345356ad85570f9ea99fbfa" dependencies = [ "bindgen 0.59.2", "cc", @@ -5197,7 +5197,7 @@ dependencies = [ [[package]] name = "rdev" version = "0.5.0-2" -source = "git+https://github.com/rustdesk-org/rdev#d4c1759926d693ba269e2cb8cf9f87b13e424e4e" +source = "git+https://github.com/rustdesk-org/rdev#961d25cc00c6b3ef80f444e6a7bed9872e2c35ea" dependencies = [ "cocoa 0.24.1", "core-foundation 0.9.4", @@ -5472,7 +5472,7 @@ dependencies = [ [[package]] name = "rustdesk" -version = "1.3.1" +version = "1.3.2" dependencies = [ "android-wakelock", "android_logger", @@ -5572,7 +5572,7 @@ dependencies = [ [[package]] name = "rustdesk-portable-packer" -version = "1.3.1" +version = "1.3.2" dependencies = [ "brotli", "dirs 5.0.1", diff --git a/pkgs/by-name/ru/rustdesk-flutter/package.nix b/pkgs/by-name/ru/rustdesk-flutter/package.nix index 2dd1b134eaa6..3ff05d808baa 100644 --- a/pkgs/by-name/ru/rustdesk-flutter/package.nix +++ b/pkgs/by-name/ru/rustdesk-flutter/package.nix @@ -29,7 +29,7 @@ let flutterRustBridge = rustPlatform.buildRustPackage rec { pname = "flutter_rust_bridge_codegen"; - version = "1.80.1"; # https://github.com/rustdesk/rustdesk/blob/1.3.1/.github/workflows/bridge.yml#L10 + version = "1.80.1"; # https://github.com/rustdesk/rustdesk/blob/1.3.2/.github/workflows/bridge.yml#L10 src = fetchFromGitHub { owner = "fzyzcjy"; @@ -51,12 +51,12 @@ let in flutter319.buildFlutterApplication rec { pname = "rustdesk"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "rustdesk"; repo = "rustdesk"; rev = version; - hash = "sha256-PioaSdvgJ9oXC5DAbl+em7rxcGx1om9+sjCMdrvox90="; + hash = "sha256-SvK11IuuTkO8sxLVnYyyRtYyzV6R9NwMtyY5UCdw/P8="; }; strictDeps = true; @@ -64,13 +64,13 @@ flutter319.buildFlutterApplication rec { # Configure the Flutter/Dart build sourceRoot = "${src.name}/flutter"; - # curl https://raw.githubusercontent.com/rustdesk/rustdesk/1.3.1/flutter/pubspec.lock | yq > pubspec.lock.json + # curl https://raw.githubusercontent.com/rustdesk/rustdesk/1.3.2/flutter/pubspec.lock | yq > pubspec.lock.json pubspecLock = lib.importJSON ./pubspec.lock.json; gitHashes = { dash_chat_2 = "sha256-J5Bc6CeCoRGN870aNEVJ2dkQNb+LOIZetfG2Dsfz5Ow="; - desktop_multi_window = "sha256-6nbOUmGTmJQx3Dr4MI6cKWwB1jEgUFUeHx24gpCkWY0="; + desktop_multi_window = "sha256-yIhcsTb3/mynUDE05c7dANj32O2tcZl8m0Tw8d36J/4="; dynamic_layouts = "sha256-eFp1YVI6vI2HRgtE5nTqGZIylB226H0O8kuxy9ypuf8="; - flutter_gpu_texture_renderer = "sha256-0znIHlZ0ashRTev2kAXU179eq/V1RJC9Hp4jAfiPh5Q="; + flutter_gpu_texture_renderer = "sha256-6m34FB9Zi4wWbpQQ7uwtMnjUBvdCQnqlkHtWcZddtqU="; flutter_improved_scrolling = "sha256-fKs1+JmhDVVfjyhr6Fl17pc6n++mCTjBo1PT3l/DUnc="; window_manager = "sha256-CUTcSl+W7Wz/Og5k9ujOdAlhKWv/gIYe58wurf9CJH4="; window_size = "sha256-+lqY46ZURT0qcqPvHFXUnd83Uvfq79Xr+rw1AHqrpak="; @@ -90,7 +90,7 @@ flutter319.buildFlutterApplication rec { "confy-0.4.0-2" = "sha256-V7BCKISrkJIxWC3WT5+B5Vav86YTQvdO9TO6A++47FU="; "core-foundation-0.9.3" = "sha256-iB4OVmWZhuWbs9RFWvNc+RNut6rip2/50o5ZM6c0c3g="; "evdev-0.11.5" = "sha256-aoPmjGi/PftnH6ClEWXHvIj0X3oh15ZC1q7wPC1XPr0="; - "hwcodec-0.7.0" = "sha256-SswZI2BJ4pRXT379cziJlisPsc5sOiOiDqJ5WaPETnA="; + "hwcodec-0.7.0" = "sha256-JdpaKIzI6AOaHPB4SeWIccpP7FuDLP00fOFnbA9DIEc="; "impersonate_system-0.1.0" = "sha256-pIV7s2qGoCIUrhaRovBDCJaGQ/pMdJacDXJmeBpkcyI="; "keepawake-0.4.3" = "sha256-cqSpkq/PCz+5+ZUyPy5hF6rP3fBzuZDywyxMUQ50Rk4="; "machine-uid-0.3.0" = "sha256-rEOyNThg6p5oqE9URnxSkPtzyW8D4zKzLi9pAnzTElE="; @@ -98,7 +98,7 @@ flutter319.buildFlutterApplication rec { "pam-0.7.0" = "sha256-o47tVoFlW9RiL7O8Lvuwz7rMYQHO+5TG27XxkAdHEOE="; "pam-sys-1.0.0-alpha4" = "sha256-5HIErVWnanLo5054NgU+DEKC2wwyiJ8AHvbx0BGbyWo="; "parity-tokio-ipc-0.7.3-4" = "sha256-PKw2Twd2ap+tRrQxqg8T1FvpoeKn0hvBqn1Z44F1LcY="; - "rdev-0.5.0-2" = "sha256-G+PvnA5mZyN080uoI5CGj/dQ9B1J4h5iYd7214MKBR8="; + "rdev-0.5.0-2" = "sha256-0e8NMPMlzkmghe/E4SssoRzbGG2jWMKwxzVpiJ8MnDo="; "reqwest-0.11.23" = "sha256-kEUT+gs4ziknDiGdPMLnj5pmxC5SBpLopZ8jZ34GDWc="; "rust-pulsectl-0.2.12" = "sha256-8jXTspWvjONFcvw9/Z8C43g4BuGZ3rsG32tvLMQbtbM="; "sciter-rs-0.5.57" = "sha256-5Nd9npdx8yQJEczHv7WmSmrE1lBfvp5z7BubTbYBg3E="; @@ -242,7 +242,7 @@ flutter319.buildFlutterApplication rec { description = "Virtual / remote desktop infrastructure for everyone! Open source TeamViewer / Citrix alternative"; homepage = "https://rustdesk.com"; license = licenses.agpl3Only; - maintainers = with maintainers; [ das_j ]; + maintainers = teams.helsinki-systems.members; mainProgram = "rustdesk"; platforms = platforms.linux; # should work on darwin as well but I have no machine to test with }; diff --git a/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json b/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json index a0a7ad0d8076..4ca542e41794 100644 --- a/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json +++ b/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json @@ -416,7 +416,7 @@ "description": { "path": ".", "ref": "HEAD", - "resolved-ref": "80b063b9d4e015f62e17f42a5aa0b3d20a365926", + "resolved-ref": "519350f1f40746798299e94786197d058353bac9", "url": "https://github.com/rustdesk-org/rustdesk_desktop_multi_window" }, "source": "git",