From 9f6ee695a7a2e7382aa8f3fde82d4f1ff7ad1450 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Sat, 31 Jan 2026 20:32:05 +0100 Subject: [PATCH] gitlab: 18.6.4 -> 18.7.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://about.gitlab.com/releases/2025/12/18/gitlab-18-7-released/ We need to use the vendored sidekiq for now, as GitLab introduced custom code changes currently making it incompatable with sidekiq upstream. The fix for gitlab_query_language is provided by Janne Heß. --- nixos/modules/services/misc/gitlab.nix | 3 +- pkgs/by-name/gi/gitaly/package.nix | 6 +- .../gi/gitlab-container-registry/package.nix | 6 +- .../code-parser.nix | 6 +- .../gitlab-elasticsearch-indexer/package.nix | 6 +- pkgs/by-name/gi/gitlab-pages/package.nix | 6 +- pkgs/by-name/gi/gitlab-shell/package.nix | 6 +- pkgs/by-name/gi/gitlab/data.json | 22 +- .../gi/gitlab/gitlab-workhorse/default.nix | 4 +- pkgs/by-name/gi/gitlab/package.nix | 48 ++ pkgs/by-name/gi/gitlab/rubyEnv/Gemfile | 416 +++++++++--------- pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock | 286 ++++++------ pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix | 249 ++++++----- pkgs/by-name/gi/gitlab/update.py | 15 - 14 files changed, 562 insertions(+), 517 deletions(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 988fc1fcc677..c353caed9e03 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -1626,7 +1626,8 @@ in nodejs gnupg - "${cfg.packages.gitlab}/share/gitlab/vendor/gems/sidekiq-${cfg.packages.gitlab.rubyEnv.gems.sidekiq.version}" + # We currently use the bundled sidekiq, if we use upstream sidekiq again, this needs to include the version + "${cfg.packages.gitlab}/share/gitlab/vendor/gems/sidekiq" # Needed for GitLab project imports gnutar diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix index 53a247b130fc..644a067c3f52 100644 --- a/pkgs/by-name/gi/gitaly/package.nix +++ b/pkgs/by-name/gi/gitaly/package.nix @@ -7,7 +7,7 @@ }: let - version = "18.6.4"; + version = "18.7.2"; 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-SH1NXP5OcJF2MCCSCEjCT2GXjHxy1i9QtPZZCJ92rY8="; + hash = "sha256-ELnkYWIblDmlZHzfr8qBo7/HzZIn9gYNPy1MqkopCc4="; }; - vendorHash = "sha256-+5CTncYwtGlScFvVc3QaEScfuqMqvsjnGhggM1HMhNU="; + vendorHash = "sha256-CSjsxwumKUbp/tSewE8iAp4c3DH6V6fNY4OCgzjvHP0="; ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" diff --git a/pkgs/by-name/gi/gitlab-container-registry/package.nix b/pkgs/by-name/gi/gitlab-container-registry/package.nix index a155a7502c4d..4161aa0fac6e 100644 --- a/pkgs/by-name/gi/gitlab-container-registry/package.nix +++ b/pkgs/by-name/gi/gitlab-container-registry/package.nix @@ -6,7 +6,7 @@ buildGo124Module rec { pname = "gitlab-container-registry"; - version = "4.34.0"; + version = "4.35.0"; rev = "v${version}-gitlab"; # nixpkgs-update: no auto update @@ -14,10 +14,10 @@ buildGo124Module rec { owner = "gitlab-org"; repo = "container-registry"; inherit rev; - hash = "sha256-KGw9kVsAePhEQ+kINgcMhGw7pSioOnqNWFnjQKu/XmY="; + hash = "sha256-IVV5nmkH8tll7S8ffO+GE/SiYm9/AtbtridebDVwCNM="; }; - vendorHash = "sha256-g4h1m7b7dkdTcSfwTZH4Z5P9RBKme441Ucg4aPIqLSY="; + vendorHash = "sha256-CvlZXGt6pSfGA2ZUPkysasKDiFHgwF2LRoYR7xxHihw="; checkFlags = let diff --git a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/code-parser.nix b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/code-parser.nix index 22fbf4b0d894..b325b72ef5df 100644 --- a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/code-parser.nix +++ b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/code-parser.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "gitlab-code-parser"; - version = "0.20.2"; + version = "0.21.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "rust/gitlab-code-parser"; tag = "v${finalAttrs.version}"; - hash = "sha256-JjWWlbSjbV9StDNI+aNExLcSNvLsuOPnqhyymEs8+Cg="; + hash = "sha256-eiK6FlIQjSwXsANrMhTm99uzv5kiR1bzH5eHy0myGX0="; }; - cargoHash = "sha256-pcWsVoC6076gdWTy3GgMXQIlKiGJZe2q7LSA9fVYxE8="; + cargoHash = "sha256-XoQFNpQ9sy990mI/8atOEcUG6bpR/EhSdhMDozxkR7w="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix index b8027fbdd3ee..4f298f9d1fb2 100644 --- a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix +++ b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix @@ -11,17 +11,17 @@ let in buildGoModule rec { pname = "gitlab-elasticsearch-indexer"; - version = "5.10.1"; + version = "5.12.0"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-elasticsearch-indexer"; rev = "v${version}"; - hash = "sha256-UB3rR6Fk/5M8rpixyg7R0Zd5JZYpG4gEEDHXOQ4b3vI="; + hash = "sha256-0uU2gUADLNMYD/4hBYqet3u45dgOC4R0e/N5Wl2g7IY="; }; - vendorHash = "sha256-EM41vNyE4nkv5IcGyRXqn+d7EHGMju2e76KWfHuOTmY="; + vendorHash = "sha256-J8sFOf2r4GwzYfMxiMEZcX7d93z2mNtqLEWHyJSiBDQ="; buildInputs = [ icu ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix index 04734f79015f..be8625f42fa2 100644 --- a/pkgs/by-name/gi/gitlab-pages/package.nix +++ b/pkgs/by-name/gi/gitlab-pages/package.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "18.6.4"; + version = "18.7.2"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-FMXfF/NpwivtfZh+r7gcVXKFCeshxHBKRNFnbCxSz1U="; + hash = "sha256-VArGJECx6IxX+AWAZCXNAS4qmGYDkSUYFJbhlZJ2W0M="; }; - vendorHash = "sha256-AL6V2LPzCGo/7IuY8msip35OScfocp3zO2ZzM8cZfnU="; + vendorHash = "sha256-AZIv/CU01OAbn5faE4EkSuDCakYzDjRprB5ox5tIlck="; subPackages = [ "." ]; ldflags = [ diff --git a/pkgs/by-name/gi/gitlab-shell/package.nix b/pkgs/by-name/gi/gitlab-shell/package.nix index 1f66858b7722..479adbf67c0b 100644 --- a/pkgs/by-name/gi/gitlab-shell/package.nix +++ b/pkgs/by-name/gi/gitlab-shell/package.nix @@ -8,14 +8,14 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "14.45.3"; + version = "14.45.5"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - hash = "sha256-S8LtWQgzyDKr4Jnk7Qn/pfLzZYYnVfZNVqNBFyqr5cM="; + hash = "sha256-D3keb81A7gyZbmJmCZJpyYFC1+JijwwbMngurAPTSKs="; }; buildInputs = [ @@ -27,7 +27,7 @@ buildGoModule rec { ./remove-hardcoded-locations.patch ]; - vendorHash = "sha256-Q3U0uuO+w+0GpDc7zEoiwUYsCIpXG+LOP822KNWR9Ww="; + vendorHash = "sha256-e8AXSryVZeVG+0cG7M3QAVCLSTdJEXLH8ZkLvCtWatU="; subPackages = [ "cmd/gitlab-shell" diff --git a/pkgs/by-name/gi/gitlab/data.json b/pkgs/by-name/gi/gitlab/data.json index 71ef0bc847c8..f958dc4c46c0 100644 --- a/pkgs/by-name/gi/gitlab/data.json +++ b/pkgs/by-name/gi/gitlab/data.json @@ -1,17 +1,17 @@ { - "version": "18.6.4", - "repo_hash": "0jj2wfh37p92dj6fnwv098qaaph9sblqc09mjrz6f5142ijlmxj9", - "yarn_hash": "19fhh3457mvls3g4swyzr2dh9q46z2zinjyw5v6sjjhfmrqs921d", - "frontend_islands_yarn_hash": "0m64xhlybjlax33k5rmj9kxcj1vzqqygybyz1yzzx9pd87570k2h", + "version": "18.7.2", + "repo_hash": "0jzmy892x0ghp9pdlan27w25s83zgk1dm4fzahsdll022zbfnmgl", + "yarn_hash": "1b4ahi47n0wy2jzlyqx71f4xndp1mbvmzcb1mx5ss40dfgiq560q", + "frontend_islands_yarn_hash": "1h9nggif6979s2vpsk0vx6ds1j33dgyd10gv0ya6avm68nljvni5", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v18.6.4-ee", + "rev": "v18.7.2-ee", "passthru": { - "GITALY_SERVER_VERSION": "18.6.4", - "GITLAB_KAS_VERSION": "18.6.4", - "GITLAB_PAGES_VERSION": "18.6.4", - "GITLAB_SHELL_VERSION": "14.45.3", - "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.10.1", - "GITLAB_WORKHORSE_VERSION": "18.6.4" + "GITALY_SERVER_VERSION": "18.7.2", + "GITLAB_KAS_VERSION": "18.7.2", + "GITLAB_PAGES_VERSION": "18.7.2", + "GITLAB_SHELL_VERSION": "14.45.5", + "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.12.0", + "GITLAB_WORKHORSE_VERSION": "18.7.2" } } diff --git a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix index c7da31f2b288..a0fc8d028e42 100644 --- a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix @@ -10,7 +10,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "18.6.4"; + version = "18.7.2"; # nixpkgs-update: no auto update src = fetchFromGitLab { @@ -22,7 +22,7 @@ buildGoModule rec { sourceRoot = "${src.name}/workhorse"; - vendorHash = "sha256-FCaqoDS6qbKs4Uy8X76cco24HIRxf9gsnQpIjJOHba0="; + vendorHash = "sha256-MfEVR8kfNvP1wAmd6PjVIcfiNojHyMmDvWjdDlnd/P0="; buildInputs = [ git ]; ldflags = [ "-X main.Version=${version}" ]; doCheck = false; diff --git a/pkgs/by-name/gi/gitlab/package.nix b/pkgs/by-name/gi/gitlab/package.nix index a78e89ebeeb5..1659670260a7 100644 --- a/pkgs/by-name/gi/gitlab/package.nix +++ b/pkgs/by-name/gi/gitlab/package.nix @@ -108,6 +108,54 @@ let ''; }; + gitlab_query_language = attrs: { + cargoDeps = rustPlatform.fetchCargoVendor { + src = stdenv.mkDerivation { + inherit (buildRubyGem { inherit (attrs) gemName version source; }) + name + src + unpackPhase + nativeBuildInputs + ; + installPhase = '' + mkdir -p $out + cp -R ext $out + cp Cargo.* $out + ''; + }; + hash = "sha256-XGeFht5QRYb4Cu3n9nt4euUeNXHh1kJ6pQ5LJjnVhzc="; + }; + + dontBuild = false; + + nativeBuildInputs = [ + cargo + rustc + rustPlatform.cargoSetupHook + rustPlatform.bindgenHook + ]; + + # The gem builder wrongly copies Cargo.lock within the gem, while it's missing in the outer rust project + # before rustc ran. + # This fixes this and makes the rustc invocation work. + preInstall = '' + export CARGO_HOME="$PWD/../.cargo/" + # Unpack + tar xvf $gempkg + # Modify + gzip -d data.tar.gz + chmod +w data.tar + mv Cargo.lock ./ext/gitlab_query_language + tar rf data.tar ./ext/gitlab_query_language/Cargo.lock + # Repack + gzip data.tar + tar -cf $gempkg data.tar.gz metadata.gz + ''; + postInstall = '' + find $out -type f -name .rustc_info.json -delete + ''; + }; + static_holmes = attrs: { nativeBuildInputs = [ icu diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile index 694acd16fc0a..17b88ae977f5 100644 --- a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile +++ b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile @@ -21,42 +21,35 @@ end extend ignore_feature_category -gem 'bundler-checksum', '~> 0.1.0', path: 'gems/bundler-checksum', require: false, feature_category: :shared +gem 'bundler-checksum', '~> 0.1.0', path: 'gems/bundler-checksum', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # See https://docs.gitlab.com/ee/development/gemfile.html#upgrade-rails for guidelines when upgrading Rails - -if next? - gem 'rails', '~> 7.2.3', feature_category: :shared -else - gem 'rails', '~> 7.1.6', feature_category: :shared -end +gem 'rails', '~> 7.2.3', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Pin Zeitwerk until https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/9408 is fixed -gem 'zeitwerk', '= 2.6.18', feature_category: :shared +gem 'zeitwerk', '= 2.6.18', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 -gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab', feature_category: :shared -# This can be dropped after upgrading to Rails 7.2: https://github.com/rails/rails/pull/49674 -gem 'mutex_m', '~> 0.3', feature_category: :shared +gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Need by Rails -gem 'drb', '~> 2.2', feature_category: :shared +gem 'drb', '~> 2.2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 -gem 'bootsnap', '~> 1.18.6', require: false, feature_category: :shared +gem 'bootsnap', '~> 1.18.6', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Avoid the precompiled native gems because Omnibus needs to build this to ensure # LD_LIBRARY_PATH is correct: https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7730 if RUBY_PLATFORM.include?('darwin') - gem 'ffi', '~> 1.17.2', feature_category: :shared + gem 'ffi', '~> 1.17.2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 else - gem 'ffi', '~> 1.17.2', force_ruby_platform: true, feature_category: :shared + gem 'ffi', '~> 1.17.2', force_ruby_platform: true, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 end -gem 'openssl', '~> 3.3.2', feature_category: :shared +gem 'openssl', '~> 3.3.2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 -gem 'gitlab-safe_request_store', path: 'gems/gitlab-safe_request_store', feature_category: :shared +gem 'gitlab-safe_request_store', path: 'gems/gitlab-safe_request_store', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # GitLab Monorepo Gems group :monorepo do - gem 'gitlab-utils', path: 'gems/gitlab-utils', feature_category: :shared + gem 'gitlab-utils', path: 'gems/gitlab-utils', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 end gem 'gitlab-backup-cli', path: 'gems/gitlab-backup-cli', require: 'gitlab/backup/cli', feature_category: :backup_restore @@ -64,30 +57,30 @@ gem 'gitlab-backup-cli', path: 'gems/gitlab-backup-cli', require: 'gitlab/backup gem 'gitlab-secret_detection', '< 1.0', feature_category: :secret_detection # Responders respond_to and respond_with -gem 'responders', '~> 3.0', feature_category: :shared +gem 'responders', '~> 3.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 -gem 'sprockets', '~> 3.7.0', feature_category: :shared -gem 'sprockets-rails', '~> 3.5.1', feature_category: :shared +gem 'sprockets', '~> 3.7.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'sprockets-rails', '~> 3.5.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 -gem 'view_component', '~> 3.23.2', feature_category: :shared +gem 'view_component', '~> 3.23.2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Supported DBs gem 'pg', '~> 1.6.1', feature_category: :database gem 'rugged', '~> 1.6', feature_category: :gitaly -gem 'faraday', '~> 2', feature_category: :shared -gem 'faraday-retry', '~> 2', feature_category: :shared +gem 'faraday', '~> 2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'faraday-retry', '~> 2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Logger is a dependency of Faraday, but Logger 1.6.0 does not work with Chef. -gem 'logger', '~> 1.7.0', feature_category: :shared +gem 'logger', '~> 1.7.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 gem 'marginalia', '~> 1.11.1', feature_category: :database # Authorization -gem 'declarative_policy', '~> 2.0.1', feature_category: :shared +gem 'declarative_policy', '~> 2.0.1', feature_category: :permissions # For source code paths mapping -gem 'coverband', '6.1.5', require: false, feature_category: :shared +gem 'coverband', '6.1.5', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Authentication libraries gem 'devise', '~> 4.9.3', feature_category: :system_access @@ -97,7 +90,7 @@ gem 'bcrypt', '~> 3.1', '>= 3.1.14', feature_category: :system_access gem 'doorkeeper', '~> 5.8', '>= 5.8.1', feature_category: :system_access gem 'doorkeeper-openid_connect', '~> 1.8.10', feature_category: :system_access gem 'doorkeeper-device_authorization_grant', '~> 1.0.0', feature_category: :system_access -gem 'rexml', '~> 3.4.0', feature_category: :shared +gem 'rexml', '~> 3.4.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 gem 'ruby-saml', '~> 1.18', feature_category: :system_access gem 'omniauth-saml', '~> 2.2.1', feature_category: :system_access gem 'omniauth', '~> 2.1.0', feature_category: :system_access @@ -134,8 +127,9 @@ gem 'invisible_captcha', '~> 2.3.0', feature_category: :insider_threat # Two-factor authentication gem 'devise-two-factor', '~> 4.1.1', feature_category: :system_access gem 'rqrcode', '~> 2.2', feature_category: :system_access +gem 'webauthn', '~> 3.0', feature_category: :system_access -gem 'attr_encrypted', '~> 4.2', feature_category: :shared +gem 'attr_encrypted', '~> 4.2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # GitLab Pages gem 'validates_hostname', '~> 1.0.13', feature_category: :pages @@ -144,7 +138,7 @@ gem 'rubyzip', '~> 2.4.0', require: 'zip', feature_category: :pages gem 'acme-client', '~> 2.0.19', feature_category: :pages # Browser detection -gem 'browser', '~> 5.3.1', feature_category: :shared +gem 'browser', '~> 5.3.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # OS detection for usage ping gem 'ohai', '~> 18.1', feature_category: :product_analytics @@ -156,7 +150,7 @@ gem 'gpgme', '~> 2.0.24', feature_category: :source_code_management # GitLab fork with several improvements to original library. For full list of changes # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master gem 'gitlab_omniauth-ldap', '~> 2.3.0', require: 'omniauth-ldap', feature_category: :system_access -gem 'net-ldap', '~> 0.17.1', feature_category: :system_access +gem 'net-ldap', '~> 0.20.0', feature_category: :system_access # API gem 'grape', '~> 2.0.0', feature_category: :api @@ -165,7 +159,7 @@ gem 'grape-swagger', '~> 2.1.2', group: [:development, :test], feature_category: gem 'grape-swagger-entity', '~> 0.5.5', group: [:development, :test], feature_category: :api gem 'grape-path-helpers', '~> 2.0.1', feature_category: :api gem 'gitlab-grape-openapi', path: 'gems/gitlab-grape-openapi', feature_category: :api -gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', feature_category: :shared +gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # GraphQL API gem 'graphql', '2.5.11', feature_category: :api @@ -184,63 +178,63 @@ gem 'gitlab-duo-workflow-service-client', '~> 0.6', feature_category: :duo_agent_platform # Generate Fake data -gem 'ffaker', '~> 2.24', feature_category: :shared +gem 'ffaker', '~> 2.24', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 -gem 'hashie', '~> 5.0.0', feature_category: :shared +gem 'hashie', '~> 5.0.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Pagination -gem 'kaminari', '~> 1.2.2', feature_category: :shared +gem 'kaminari', '~> 1.2.2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # HAML -gem 'hamlit', '~> 3.0.0', feature_category: :shared +gem 'hamlit', '~> 3.0.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Files attachments -gem 'carrierwave', '~> 1.3', feature_category: :shared -gem 'mini_magick', '~> 4.12', feature_category: :shared -gem 'marcel', '~> 1.0.4', feature_category: :shared +gem 'carrierwave', '~> 1.3', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'mini_magick', '~> 4.12', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'marcel', '~> 1.0.4', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # PDF generation gem 'prawn', feature_category: :vulnerability_management gem 'prawn-svg', feature_category: :vulnerability_management # for backups -gem 'fog-aws', '~> 3.26', feature_category: :shared -gem 'fog-core', '~> 2.5', feature_category: :shared -gem 'fog-google', '~> 1.25', require: 'fog/google', feature_category: :shared -gem 'fog-local', '~> 0.8', feature_category: :shared +gem 'fog-aws', '~> 3.26', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'fog-core', '~> 2.5', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'fog-google', '~> 1.25', require: 'fog/google', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'fog-local', '~> 0.8', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # NOTE: # the fog-aliyun gem since v0.4 pulls in aliyun-sdk transitively, which monkey-patches # the rest-client gem to drop the Content-Length header field for chunked transfers, # which may have knock-on effects on other features using `RestClient`. # 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', feature_category: :shared -gem 'gitlab-fog-azure-rm', '~> 2.4.0', require: 'fog/azurerm', feature_category: :shared +gem 'fog-aliyun', '~> 0.4', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'gitlab-fog-azure-rm', '~> 2.4.0', require: 'fog/azurerm', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # for Google storage # Need this specific version of google-apis-storage_v1 so that fog-google will utilize the updated list_objects with # match_glob support in google-apis-core 0.11.1. Because of this we also have to bump google-cloud-storage to 1.45.0. -gem 'google-apis-storage_v1', '~> 0.29', feature_category: :shared -gem 'google-cloud-storage', '~> 1.57.0', feature_category: :shared +gem 'google-apis-storage_v1', '~> 0.29', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'google-cloud-storage', '~> 1.57.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # We need >= 0.11.1 because that's when match_glob support is added to list_objects -gem 'google-apis-core', '~> 0.18.0', '>= 0.18.0', feature_category: :shared -gem 'google-apis-compute_v1', '~> 0.129.0', feature_category: :shared -gem 'google-apis-container_v1', '~> 0.100.0', feature_category: :shared -gem 'google-apis-container_v1beta1', '~> 0.91.0', feature_category: :shared -gem 'google-apis-cloudbilling_v1', '~> 0.22.0', feature_category: :shared -gem 'google-apis-cloudresourcemanager_v1', '~> 0.44.0', feature_category: :shared -gem 'google-apis-iam_v1', '~> 0.79.0', feature_category: :shared -gem 'google-apis-serviceusage_v1', '~> 0.28.0', feature_category: :shared -gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0', feature_category: :shared -gem 'google-apis-androidpublisher_v3', '~> 0.86.0', feature_category: :shared +gem 'google-apis-core', '~> 0.18.0', '>= 0.18.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'google-apis-compute_v1', '~> 0.129.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'google-apis-container_v1', '~> 0.100.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'google-apis-container_v1beta1', '~> 0.91.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'google-apis-cloudbilling_v1', '~> 0.22.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'google-apis-cloudresourcemanager_v1', '~> 0.44.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'google-apis-iam_v1', '~> 0.79.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'google-apis-serviceusage_v1', '~> 0.28.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'google-apis-androidpublisher_v3', '~> 0.86.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 -gem 'googleauth', '~> 1.14', 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 +gem 'googleauth', '~> 1.14', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'google-cloud-artifact_registry-v1', '~> 0.11.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'google-cloud-compute-v1', '~> 2.6.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Seed data -gem 'seed-fu', '~> 2.3.7', feature_category: :shared +gem 'seed-fu', '~> 2.3.7', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Search gem 'elasticsearch-model', '~> 7.2', feature_category: :global_search @@ -259,7 +253,6 @@ gem 'gitlab-active-context', path: 'gems/gitlab-active-context', require: 'activ # Markdown and HTML processing gem 'html-pipeline', '~> 2.14.3', feature_category: :markdown -gem 'deckar01-task_list', '2.3.4', feature_category: :markdown gem 'gitlab-markup', '~> 2.0.0', require: 'github/markup', feature_category: :markdown gem 'commonmarker', '~> 0.23.10', feature_category: :markdown gem 'kramdown', '~> 2.5.0', feature_category: :markdown @@ -271,9 +264,9 @@ gem 'asciidoctor', '~> 2.0.18', feature_category: :markdown gem 'asciidoctor-include-ext', '~> 0.4.0', require: false, feature_category: :markdown gem 'asciidoctor-plantuml', '~> 0.0.16', feature_category: :markdown gem 'asciidoctor-kroki', '~> 0.10.0', require: false, feature_category: :markdown -gem 'rouge', '~> 4.6.1', feature_category: :shared +gem 'rouge', '~> 4.6.1', feature_category: :markdown gem 'truncato', '~> 0.7.13', feature_category: :team_planning -gem 'nokogiri', '~> 1.18', feature_category: :shared +gem 'nokogiri', '~> 1.18', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 gem 'gitlab-glfm-markdown', '~> 0.0.39', feature_category: :markdown gem 'tanuki_emoji', '~> 0.13', feature_category: :markdown gem 'unicode-emoji', '~> 4.0', feature_category: :markdown @@ -282,24 +275,24 @@ gem 'unicode-emoji', '~> 4.0', feature_category: :markdown gem 'icalendar', '~> 2.10.1', feature_category: :team_planning # Diffs -gem 'diffy', '~> 3.4', feature_category: :shared +gem 'diffy', '~> 3.4', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 gem 'diff_match_patch', '~> 0.1.0', path: 'vendor/gems/diff_match_patch', feature_category: :team_planning # Application server -gem 'rack', '~> 2.2.9', feature_category: :shared +gem 'rack', '~> 2.2.9', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # https://github.com/zombocom/rack-timeout/blob/master/README.md#rails-apps-manually -gem 'rack-timeout', '~> 0.7.0', require: 'rack/timeout/base', feature_category: :shared +gem 'rack-timeout', '~> 0.7.0', require: 'rack/timeout/base', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 group :puma do - gem 'puma', '= 6.6.1', require: false, feature_category: :shared - gem 'sd_notify', '~> 0.1.0', require: false, feature_category: :shared + gem 'puma', '~> 7.1', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 + gem 'sd_notify', '~> 0.1.0', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 end # State machine -gem 'state_machines-activerecord', '~> 0.8.0', feature_category: :shared +gem 'state_machines-activerecord', '~> 0.100.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Background jobs -gem 'sidekiq', '~> 7.3.9', feature_category: :scalability +gem 'sidekiq', path: 'vendor/gems/sidekiq', require: 'sidekiq', feature_category: :scalability gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', @@ -310,35 +303,35 @@ gem 'gitlab-sidekiq-fetcher', gem 'fugit', '~> 1.11.1', feature_category: :continuous_integration # HTTP requests -gem 'httparty', '~> 0.23.0', feature_category: :shared +gem 'httparty', '~> 0.23.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Colored output to console -gem 'rainbow', '~> 3.0', feature_category: :shared +gem 'rainbow', '~> 3.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Progress bar -gem 'ruby-progressbar', '~> 1.10', feature_category: :shared +gem 'ruby-progressbar', '~> 1.10', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Linear-time regex library for untrusted regular expressions -gem 're2', '~> 2.15', feature_category: :shared +gem 're2', '~> 2.15', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Misc gem 'semver_dialects', '~> 3.7', feature_category: :software_composition_analysis -gem 'version_sorter', '~> 2.3', feature_category: :shared -gem 'csv_builder', path: 'gems/csv_builder', feature_category: :shared +gem 'version_sorter', '~> 2.3', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'csv_builder', path: 'gems/csv_builder', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Export Ruby Regex to Javascript -gem 'js_regex', '~> 3.8', feature_category: :shared +gem 'js_regex', '~> 3.8', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # User agent parsing -gem 'device_detector', feature_category: :shared +gem 'device_detector', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Redis gem 'redis', '~> 5.4.1', feature_category: :redis gem 'redis-client', '~> 0.25', feature_category: :redis gem 'redis-cluster-client', '~> 0.13', feature_category: :redis gem 'redis-clustering', '~> 5.4.0', feature_category: :redis -gem 'connection_pool', '~> 2.5.3', feature_category: :shared +gem 'connection_pool', '~> 2.5.3', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Redis session store gem 'redis-actionpack', '~> 5.5.0', feature_category: :redis @@ -351,48 +344,48 @@ gem 'atlassian-jwt', '~> 0.2.1', feature_category: :integrations gem 'slack-messenger', '~> 2.3.5', feature_category: :integrations # Kubernetes integration -gem 'kubeclient', '~> 4.12.0', feature_category: :shared +gem 'kubeclient', '~> 4.12.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # AI -gem 'circuitbox', '2.0.0', feature_category: :shared +gem 'circuitbox', '2.0.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Sanitize user input -gem 'sanitize', '~> 6.0.2', feature_category: :shared -gem 'babosa', '~> 2.0', feature_category: :shared +gem 'sanitize', '~> 6.0.2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'babosa', '~> 2.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Sanitizes SVG input -gem 'loofah', '~> 2.24.0', feature_category: :shared +gem 'loofah', '~> 2.24.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Used to provide license templates -gem 'licensee', '~> 9.16', feature_category: :shared +gem 'licensee', '~> 9.16', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Detect and convert string character encoding -gem 'charlock_holmes', '~> 0.7.9', feature_category: :shared +gem 'charlock_holmes', '~> 0.7.9', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Detect mime content type from content -gem 'ruby-magic', '~> 0.6', feature_category: :shared +gem 'ruby-magic', '~> 0.6', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Faster blank -gem 'fast_blank', '~> 1.0.1', feature_category: :shared +gem 'fast_blank', '~> 1.0.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Parse time & duration -gem 'gitlab-chronic', '~> 0.10.5', feature_category: :shared -gem 'gitlab_chronic_duration', '~> 0.12', feature_category: :shared +gem 'gitlab-chronic', '~> 0.10.5', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'gitlab_chronic_duration', '~> 0.12', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 -gem 'rack-proxy', '~> 0.7.7', feature_category: :shared +gem 'rack-proxy', '~> 0.7.7', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 -gem 'cssbundling-rails', '1.4.3', feature_category: :shared -gem 'terser', '1.0.2', feature_category: :shared +gem 'cssbundling-rails', '1.4.3', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'terser', '1.0.2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 -gem 'click_house-client', '0.8.2', feature_category: :database -gem 'addressable', '~> 2.8', feature_category: :shared -gem 'gon', '~> 6.5.0', feature_category: :shared -gem 'request_store', '~> 1.7.0', feature_category: :shared -gem 'base32', '~> 0.3.0', feature_category: :shared -gem 'gitlab-license', '~> 2.6', feature_category: :shared +gem 'click_house-client', '0.8.4', feature_category: :database +gem 'addressable', '~> 2.8', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'gon', '~> 6.5.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'request_store', '~> 1.7.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'base32', '~> 0.3.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'gitlab-license', '~> 2.6', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Protect against bruteforcing -gem 'rack-attack', '~> 6.8.0', feature_category: :shared +gem 'rack-attack', '~> 6.8.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Sentry integration gem 'sentry-ruby', '~> 5.23.0', feature_category: :observability @@ -403,12 +396,12 @@ gem 'sentry-sidekiq', '~> 5.23.0', feature_category: :observability # gem 'pg_query', '~> 6.1.0', feature_category: :database -gem 'gitlab-schema-validation', path: 'gems/gitlab-schema-validation', feature_category: :shared -gem 'gitlab-http', path: 'gems/gitlab-http', feature_category: :shared +gem 'gitlab-schema-validation', path: 'gems/gitlab-schema-validation', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'gitlab-http', path: 'gems/gitlab-http', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 gem 'premailer-rails', '~> 1.12.0', feature_category: :notifications -gem 'gitlab-labkit', '~> 0.42.2', feature_category: :shared -gem 'thrift', '~> 0.22.0', feature_category: :shared +gem 'gitlab-labkit', '~> 1.0.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'thrift', '~> 0.22.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # I18n gem 'rails-i18n', '~> 7.0', '>= 7.0.9', feature_category: :internationalization @@ -418,31 +411,31 @@ gem 'gettext', '~> 3.5', '>= 3.5.1', group: [:development, :test], feature_category: :internationalization -gem 'batch-loader', '~> 2.0.5', feature_category: :shared +gem 'batch-loader', '~> 2.0.5', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 -gem 'tty-prompt', '~> 0.23', require: false, feature_category: :shared +gem 'tty-prompt', '~> 0.23', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Perf bar -gem 'peek', '~> 1.1', feature_category: :shared +gem 'peek', '~> 1.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Snowplow events trackin gem 'snowplow-tracker', '~> 0.8.0', feature_category: :product_analytics # Metrics -gem 'webrick', '~> 1.9.0', require: false, feature_category: :shared -gem 'prometheus-client-mmap', '~> 1.2.9', require: 'prometheus/client', feature_category: :shared +gem 'webrick', '~> 1.9.0', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'prometheus-client-mmap', '~> 1.2.9', require: 'prometheus/client', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Event-driven reactor for Ruby # Required manually in config/initializers/require_async_gem -gem 'async', '~> 2.32.0', require: false, feature_category: :shared -gem 'io-event', '~> 1.12', require: false, feature_category: :shared +gem 'async', '~> 2.32.0', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'io-event', '~> 1.12', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Security report schemas used to validate CI job artifacts of security jobs gem 'gitlab-security_report_schemas', '0.1.3.min15.0.0.max15.2.3', feature_category: :vulnerability_management # Frontend bundling -gem 'vite_rails', '~> 3.0.17', feature_category: :shared -gem 'vite_ruby', '~> 3.9.0', feature_category: :shared +gem 'vite_rails', '~> 3.0.17', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'vite_ruby', '~> 3.9.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # OpenTelemetry group :opentelemetry do @@ -474,80 +467,77 @@ group :opentelemetry do gem 'opentelemetry-instrumentation-sidekiq', feature_category: :observability end -gem 'warning', '~> 1.5.0', feature_category: :shared +gem 'warning', '~> 1.5.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 group :development do gem 'lefthook', '~> 1.13.0', require: false, feature_category: :tooling gem 'rubocop', feature_category: :tooling, require: false - gem 'debug', '~> 1.11.0', feature_category: :shared + gem 'debug', '~> 1.11.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'solargraph', '~> 0.54.0', require: false, feature_category: :shared - gem 'solargraph-rspec', '~> 0.5.1', require: false, feature_category: :shared + gem 'solargraph', '~> 0.54.0', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 + gem 'solargraph-rspec', '~> 0.5.1', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'letter_opener_web', '~> 3.0.0', feature_category: :shared - gem 'lookbook', '~> 2.3', feature_category: :shared + gem 'letter_opener_web', '~> 3.0.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 + gem 'lookbook', '~> 2.3', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - # Better errors handler - gem 'better_errors', '~> 2.10.1', feature_category: :shared + gem 'sprite-factory', '~> 1.7', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'sprite-factory', '~> 1.7', feature_category: :shared + gem 'listen', '~> 3.7', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'listen', '~> 3.7', feature_category: :shared - - gem 'ruby-lsp', "~> 0.26.0", require: false, feature_category: :tooling + gem 'ruby-lsp', "~> 0.26.4", require: false, feature_category: :tooling gem 'ruby-lsp-rails', "~> 0.4.8", feature_category: :tooling - gem 'ruby-lsp-rspec', "~> 0.1.27", require: false, feature_category: :tooling + gem 'ruby-lsp-rspec', "~> 0.1.28", 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 + gem 'git', '~> 1.8', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 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.10.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 'deprecation_toolkit', '~> 2.2.3', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 + gem 'bullet', '~> 8.0.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 + gem 'parser', '= 3.3.10.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 + gem 'pry-byebug', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 + gem 'pry-rails', '~> 0.3.9', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 + gem 'pry-shell', '~> 0.6.4', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'amazing_print', require: false, feature_category: :shared + gem 'amazing_print', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 gem 'database_cleaner-active_record', '~> 2.2.0', feature_category: :database - gem 'rspec-rails', '~> 7.1.0', feature_category: :shared + gem 'rspec-rails', '~> 7.1.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 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 'minitest', '~> 5.11.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'spring', '~> 4.3.0', feature_category: :shared - gem 'spring-commands-rspec', '~> 1.0.4', feature_category: :shared + gem 'spring', '~> 4.3.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 + gem 'spring-commands-rspec', '~> 1.0.4', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 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 + gem 'benchmark-ips', '~> 2.14.0', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 + gem 'benchmark-memory', '~> 0.1', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 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 'simple_po_parser', '~> 1.1.6', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'png_quantizator', '~> 0.2.1', require: false, feature_category: :shared + gem 'png_quantizator', '~> 0.2.1', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'parallel', '~> 1.19', require: false, feature_category: :shared + gem 'parallel', '~> 1.19', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup', feature_category: :shared + gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'pact', '~> 1.64', feature_category: :shared + gem 'pact', '~> 1.64', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 gem 'gitlab-housekeeper', path: 'gems/gitlab-housekeeper', feature_category: :tooling @@ -567,12 +557,12 @@ end # Gems required in omnibus-gitlab pipeline group :development, :test, :omnibus do - gem 'license_finder', '~> 7.0', require: false, feature_category: :shared + gem 'license_finder', '~> 7.0', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 end # Gems required in various pipelines group :development, :test, :monorepo do - gem 'gitlab-rspec', path: 'gems/gitlab-rspec', feature_category: :shared + gem 'gitlab-rspec', path: 'gems/gitlab-rspec', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 gem 'gitlab-rspec_flaky', path: 'gems/gitlab-rspec_flaky', feature_category: :tooling end @@ -587,26 +577,26 @@ group :test do 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 'graphlyte', '~> 1.0.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Upload CI metrics to a GCP BigQuery instance # # We only use this gem in CI. gem 'google-cloud-bigquery', '~> 1.0', feature_category: :tooling - 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 'shoulda-matchers', '~> 6.4.0', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 + gem 'email_spec', '~> 2.3.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 + gem 'webmock', '~> 3.25.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 + gem 'rails-controller-testing', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 + gem 'concurrent-ruby', '~> 1.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 + gem 'test-prof', '~> 1.5.0', feature_category: :tooling + gem 'rspec_junit_formatter', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 + gem 'guard-rspec', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 gem 'axe-core-rspec', '~> 4.10.0', feature_category: :tooling - gem 'state_machines-rspec', '~> 0.6', feature_category: :shared + gem 'state_machines-rspec', '~> 0.6', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 - gem 'derailed_benchmarks', require: false, feature_category: :shared + gem 'derailed_benchmarks', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 gem 'gitlab_quality-test_tooling', '~> 3.1.0', require: false, feature_category: :tooling end @@ -615,67 +605,67 @@ 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 'gitlab-mail_room', '~> 0.0.24', require: 'mail_room', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 -gem 'email_reply_trimmer', '~> 0.1', feature_category: :shared -gem 'html2text', feature_category: :shared +gem 'email_reply_trimmer', '~> 0.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'html2text', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 -gem 'stackprof', '~> 0.2.26', require: false, feature_category: :shared -gem 'rbtrace', '~> 0.4', require: false, feature_category: :shared -gem 'memory_profiler', '~> 1.0', require: false, feature_category: :shared +gem 'stackprof', '~> 0.2.26', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'rbtrace', '~> 0.4', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'memory_profiler', '~> 1.0', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # OAuth gem 'oauth2', '~> 2.0', feature_category: :system_access # Health check -gem 'health_check', '~> 3.0', feature_category: :shared +gem 'health_check', '~> 3.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # System information -gem 'vmstat', '~> 2.3.0', feature_category: :shared -gem 'sys-filesystem', '~> 1.4.3', feature_category: :shared +gem 'vmstat', '~> 2.3.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'sys-filesystem', '~> 1.4.3', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # NTP client -gem 'net-ntp', feature_category: :shared +gem 'net-ntp', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # SSH keys support -gem 'ssh_data', '~> 2.0', feature_category: :shared +gem 'ssh_data', '~> 2.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Spamcheck GRPC protocol definitions gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 18.6.0.pre.rc1', feature_category: :gitaly +gem 'gitaly', '~> 18.7.0.pre.rc1', feature_category: :gitaly # KAS GRPC protocol definitions gem 'gitlab-kas-grpc', '~> 18.5.0-rc4', feature_category: :deployment_management -gem 'grpc', '~> 1.76.0', feature_category: :shared +gem 'grpc', '~> 1.76.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 -gem 'google-protobuf', '~> 3.25', '>= 3.25.3', feature_category: :shared +gem 'google-protobuf', '>= 3.25', '< 5.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 -gem 'toml-rb', '~> 2.2.0', feature_category: :shared +gem 'toml-rb', '~> 2.2.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Feature toggles -gem 'flipper', '~> 0.28.0', feature_category: :shared -gem 'flipper-active_record', '~> 0.28.0', feature_category: :shared -gem 'flipper-active_support_cache_store', '~> 0.28.0', feature_category: :shared -gem 'unleash', '~> 3.2.2', feature_category: :shared -gem 'gitlab-experiment', '~> 1.0.0', feature_category: :shared +gem 'flipper', '~> 0.28.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'flipper-active_record', '~> 0.28.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'flipper-active_support_cache_store', '~> 0.28.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'unleash', '~> 3.2.2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'gitlab-experiment', '~> 1.1.0', feature_category: :acquisition # Structured logging -gem 'lograge', '~> 0.5', feature_category: :shared +gem 'lograge', '~> 0.5', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 gem 'grape_logging', '~> 1.8', '>= 1.8.4', feature_category: :api # DNS Lookup -gem 'gitlab-net-dns', '~> 0.15.0', feature_category: :shared +gem 'gitlab-net-dns', '~> 0.15.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Countries list -gem 'countries', '~> 4.0.0', feature_category: :shared +gem 'countries', '~> 4.0.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 -gem 'retriable', '~> 3.1.2', feature_category: :shared +gem 'retriable', '~> 3.1.2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # LRU cache -gem 'lru_redux', feature_category: :shared +gem 'lru_redux', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Locked as long as quoted-printable encoding issues are not resolved # Monkey-patched in `config/initializers/mail_encoding_patch.rb` @@ -684,40 +674,38 @@ gem 'lru_redux', feature_category: :shared # `config/initializers/mail_starttls_patch.rb` has also been patched to # fix STARTTLS handling until https://github.com/mikel/mail/pull/1536 is # released. -gem 'mail', '= 2.9.0', feature_category: :shared -gem 'mail-smtp_pool', '~> 0.1.0', path: 'gems/mail-smtp_pool', require: false, feature_category: :shared +gem 'mail', '= 2.9.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'mail-smtp_pool', '~> 0.1.0', path: 'gems/mail-smtp_pool', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 -gem 'microsoft_graph_mailer', '~> 0.1.0', path: 'vendor/gems/microsoft_graph_mailer', feature_category: :shared +gem 'microsoft_graph_mailer', '~> 0.1.0', path: 'vendor/gems/microsoft_graph_mailer', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # File encryption -gem 'lockbox', '~> 1.4.0', feature_category: :shared +gem 'lockbox', '~> 1.4.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Email validation -gem 'valid_email', '~> 0.1', feature_category: :shared +gem 'valid_email', '~> 0.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # JSON -gem 'jsonb_accessor', '~> 1.4', feature_category: :shared -gem 'json', '~> 2.13.0', feature_category: :shared -gem 'json_schemer', '~> 2.3.0', feature_category: :shared -gem 'oj', '~> 3.16.0', '>=3.16.10', feature_category: :shared -gem 'oj-introspect', '~> 0.8', feature_category: :shared -gem 'multi_json', '~> 1.17.0', feature_category: :shared -gem 'yajl-ruby', '~> 1.4.3', require: 'yajl', feature_category: :shared - -gem 'webauthn', '~> 3.0', feature_category: :shared +gem 'jsonb_accessor', '~> 1.4', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'json', '~> 2.13.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'json_schemer', '~> 2.3.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'oj', '~> 3.16.0', '>=3.16.10', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'oj-introspect', '~> 0.8', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'multi_json', '~> 1.17.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'yajl-ruby', '~> 1.4.3', require: 'yajl', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # IPAddress utilities -gem 'ipaddress', '~> 0.8.3', feature_category: :shared +gem 'ipaddress', '~> 0.8.3', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 -gem 'parslet', '~> 1.8', feature_category: :shared +gem 'parslet', '~> 1.8', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 -gem 'ipynbdiff', path: 'gems/ipynbdiff', require: 'ipynb_diff', feature_category: :shared +gem 'ipynbdiff', path: 'gems/ipynbdiff', require: 'ipynb_diff', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 -gem 'ed25519', '~> 1.4.0', feature_category: :shared +gem 'ed25519', '~> 1.4.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Error Tracking OpenAPI client # See https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/development/rake_tasks.md#update-openapi-client-for-error-tracking-feature -gem 'error_tracking_open_api', path: 'gems/error_tracking_open_api', feature_category: :shared +gem 'error_tracking_open_api', path: 'gems/error_tracking_open_api', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Vulnerability advisories gem 'cvss-suite', '~> 3.3.0', require: 'cvss_suite', feature_category: :software_composition_analysis @@ -726,7 +714,7 @@ gem 'cvss-suite', '~> 3.3.0', require: 'cvss_suite', feature_category: :software gem 'arr-pm', '~> 0.0.12', feature_category: :package_registry # Remote Development -gem 'devfile', '~> 0.4.8', feature_category: :workspaces +gem 'devfile', '~> 0.5.0', feature_category: :workspaces gem 'hashdiff', '~> 1.2.0', feature_category: :workspaces # Apple plist parsing @@ -738,27 +726,29 @@ gem 'telesignenterprise', '~> 2.6', feature_category: :insider_threat # NOTE: In Ruby 3.4 base64 was moved out of the stdlib # This gem was added while upgrading `telesignenterprise` to 2.6.0 to ensure compatibility with Ruby 3.4 -gem "base64", "~> 0.2.0", feature_category: :shared +gem "base64", "~> 0.2.0", feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # BufferedIO patch -gem 'net-protocol', '~> 0.2.2', feature_category: :shared -gem "nkf", "~> 0.2.0", feature_category: :shared +gem 'net-protocol', '~> 0.2.2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem "nkf", "~> 0.2.0", feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # This is locked to 0.6.0 because we patch Net::HTTP#connect in # gems/gitlab-http/lib/net_http/connect_patch.rb. # It can be upgraded but care must be taken to preserve the patch. -gem 'net-http', '= 0.6.0', feature_category: :shared -# This is locked to 0.13.0 because the default parser changes from RFC2396 to RFC3986, -# which can be removed after Rails 7.2 upgrade -# See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/173142#note_2277952450 -gem 'uri', '= 0.13.3', feature_category: :shared +gem 'net-http', '= 0.6.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 + +gem 'uri', '~> 1.1.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 gem 'duo_api', '~> 1.3', feature_category: :system_access gem 'gitlab-sdk', '~> 0.3.0', feature_category: :application_instrumentation -gem 'paper_trail', '~> 16.0', feature_category: :shared +gem 'paper_trail', '~> 16.0', feature_category: :workspaces gem "i18n_data", "~> 0.13.1", feature_category: :system_access gem "gitlab-cloud-connector", "~> 1.35", require: 'gitlab/cloud_connector', feature_category: :plan_provisioning + +gem "gvltools", "~> 0.4.0", feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 + +gem 'gitlab_query_language', '~> 0.20.11', feature_category: :integrations diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock index 493894c88546..037fafba3911 100644 --- a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock @@ -47,7 +47,7 @@ PATH concurrent-ruby (~> 1.1) faraday (~> 2) google-cloud-storage_transfer (~> 1.2.0) - google-protobuf (~> 3.25, >= 3.25.3) + google-protobuf (>= 3.25, < 5.0) googleauth (~> 1.14) grpc (~> 1.75) json (~> 2.7) @@ -101,6 +101,7 @@ PATH gitlab-rspec (0.1.0) activerecord (>= 6.1, < 8) activesupport (>= 6.1, < 8) + gitlab_quality-test_tooling (>= 3.1, < 4) rspec (~> 3.0) PATH @@ -162,7 +163,7 @@ PATH remote: vendor/gems/gitlab-topology-service-client specs: gitlab-topology-service-client (0.1) - google-protobuf (~> 3) + google-protobuf (>= 3.25, < 5.0) grpc PATH @@ -201,6 +202,16 @@ PATH json (>= 2.5) sidekiq (~> 7.0) +PATH + remote: vendor/gems/sidekiq + specs: + sidekiq (7.3.9) + base64 + connection_pool (>= 2.3.0) + logger + rack (>= 2.2.4) + redis-client (>= 0.22.2) + GEM remote: https://rubygems.org/ specs: @@ -209,89 +220,83 @@ GEM nkf rexml RedCloth (4.3.4) - acme-client (2.0.26) + acme-client (2.0.27) base64 (~> 0.2) faraday (>= 1.0, < 3.0.0) faraday-retry (>= 1.0, < 3.0.0) - actioncable (7.1.6) - actionpack (= 7.1.6) - activesupport (= 7.1.6) + actioncable (7.2.3) + actionpack (= 7.2.3) + activesupport (= 7.2.3) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.1.6) - actionpack (= 7.1.6) - activejob (= 7.1.6) - activerecord (= 7.1.6) - activestorage (= 7.1.6) - activesupport (= 7.1.6) - mail (>= 2.7.1) - net-imap - net-pop - net-smtp - actionmailer (7.1.6) - actionpack (= 7.1.6) - actionview (= 7.1.6) - activejob (= 7.1.6) - activesupport (= 7.1.6) - mail (~> 2.5, >= 2.5.4) - net-imap - net-pop - net-smtp + actionmailbox (7.2.3) + actionpack (= 7.2.3) + activejob (= 7.2.3) + activerecord (= 7.2.3) + activestorage (= 7.2.3) + activesupport (= 7.2.3) + mail (>= 2.8.0) + actionmailer (7.2.3) + actionpack (= 7.2.3) + actionview (= 7.2.3) + activejob (= 7.2.3) + activesupport (= 7.2.3) + mail (>= 2.8.0) rails-dom-testing (~> 2.2) - actionpack (7.1.6) - actionview (= 7.1.6) - activesupport (= 7.1.6) + actionpack (7.2.3) + actionview (= 7.2.3) + activesupport (= 7.2.3) cgi nokogiri (>= 1.8.5) racc - rack (>= 2.2.4) + rack (>= 2.2.4, < 3.3) rack-session (>= 1.0.1) rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actiontext (7.1.6) - actionpack (= 7.1.6) - activerecord (= 7.1.6) - activestorage (= 7.1.6) - activesupport (= 7.1.6) + useragent (~> 0.16) + actiontext (7.2.3) + actionpack (= 7.2.3) + activerecord (= 7.2.3) + activestorage (= 7.2.3) + activesupport (= 7.2.3) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.1.6) - activesupport (= 7.1.6) + actionview (7.2.3) + activesupport (= 7.2.3) builder (~> 3.1) cgi erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activejob (7.1.6) - activesupport (= 7.1.6) + activejob (7.2.3) + activesupport (= 7.2.3) globalid (>= 0.3.6) - activemodel (7.1.6) - activesupport (= 7.1.6) - activerecord (7.1.6) - activemodel (= 7.1.6) - activesupport (= 7.1.6) + activemodel (7.2.3) + activesupport (= 7.2.3) + activerecord (7.2.3) + activemodel (= 7.2.3) + activesupport (= 7.2.3) timeout (>= 0.4.0) - activestorage (7.1.6) - actionpack (= 7.1.6) - activejob (= 7.1.6) - activerecord (= 7.1.6) - activesupport (= 7.1.6) + activestorage (7.2.3) + actionpack (= 7.2.3) + activejob (= 7.2.3) + activerecord (= 7.2.3) + activesupport (= 7.2.3) marcel (~> 1.0) - activesupport (7.1.6) + activesupport (7.2.3) base64 benchmark (>= 0.3) bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) logger (>= 1.4.2) minitest (>= 5.1) - mutex_m securerandom (>= 0.3) - tzinfo (~> 2.0) + tzinfo (~> 2.0, >= 2.0.5) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) aes_key_wrap (1.1.0) @@ -380,10 +385,6 @@ GEM memory_profiler (~> 1) benchmark-perf (0.6.0) benchmark-trend (0.4.0) - better_errors (2.10.1) - erubi (>= 1.0.0) - rack (>= 0.9.0) - rouge (>= 1.0.0) bigdecimal (3.2.3) bindata (2.4.11) binding_of_caller (1.0.0) @@ -434,7 +435,7 @@ GEM cork nap open4 (~> 1.3) - click_house-client (0.8.2) + click_house-client (0.8.4) activerecord (>= 7.0, < 9.0) activesupport (>= 7.0, < 9.0) addressable (~> 2.8) @@ -497,8 +498,6 @@ GEM irb (~> 1.10) reline (>= 0.3.8) debug_inspector (1.1.0) - deckar01-task_list (2.3.4) - html-pipeline (~> 2.0) declarative (0.0.20) declarative_policy (2.0.1) deprecation_toolkit (2.2.4) @@ -523,7 +522,7 @@ GEM thor (>= 0.19, < 2) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devfile (0.4.8) + devfile (0.5.0) device_detector (1.1.3) devise (4.9.4) bcrypt (~> 3.0) @@ -670,7 +669,7 @@ GEM fog-json ipaddress (~> 0.8) xml-simple (~> 1.1) - fog-aws (3.33.0) + fog-aws (3.33.1) base64 (>= 0.2, < 0.4) fog-core (~> 2.6) fog-json (~> 1.1) @@ -680,7 +679,7 @@ GEM excon (~> 1.0) formatador (>= 0.2, < 2.0) mime-types - fog-google (1.25.0) + fog-google (1.26.0) addressable (>= 2.7.0) fog-core (~> 2.5) fog-json (~> 1.2) @@ -707,14 +706,16 @@ GEM et-orbi (~> 1, >= 1.2.11) raabro (~> 1.4) fuzzyurl (0.9.0) - gapic-common (0.20.0) + gapic-common (1.2.0) faraday (>= 1.9, < 3.a) faraday-retry (>= 1.0, < 3.a) - google-protobuf (~> 3.14) - googleapis-common-protos (>= 1.3.12, < 2.a) - googleapis-common-protos-types (>= 1.3.1, < 2.a) - googleauth (~> 1.0) - grpc (~> 1.36) + google-cloud-env (~> 2.2) + google-logging-utils (~> 0.1) + google-protobuf (~> 4.26) + googleapis-common-protos (~> 1.6) + googleapis-common-protos-types (~> 1.15) + googleauth (~> 1.12) + grpc (~> 1.66) gdk-toogle (0.9.5) haml rails (>= 7.0.4.2) @@ -732,7 +733,7 @@ GEM git (1.19.1) addressable (~> 2.8) rchardet (~> 1.8) - gitaly (18.6.0.pre.rc1) + gitaly (18.7.0.pre.rc1) grpc (~> 1.0) gitlab (4.19.0) httparty (~> 0.20) @@ -749,7 +750,7 @@ GEM danger (>= 9.3.0) danger-gitlab (>= 8.0.0) rake (~> 13.0) - gitlab-experiment (1.0.0) + gitlab-experiment (1.1.0) activesupport (>= 3.0) request_store (>= 1.0) gitlab-fog-azure-rm (2.4.0) @@ -765,11 +766,11 @@ GEM rb_sys (~> 0.9.109) gitlab-kas-grpc (18.5.0.pre.rc4) grpc (~> 1.0) - gitlab-labkit (0.42.2) + gitlab-labkit (1.0.1) actionpack (>= 5.0.0, < 8.1.0) activesupport (>= 5.0.0, < 8.1.0) - google-protobuf (~> 3) - grpc (>= 1.62) + google-protobuf (>= 3.25, < 5.0) + grpc (>= 1.75) jaeger-client (~> 1.1.0) json-schema (~> 5.1) opentracing (~> 0.4) @@ -790,7 +791,7 @@ GEM activesupport (>= 5.2.0) rake (~> 13.0) snowplow-tracker (~> 0.8.0) - gitlab-secret_detection (0.38.0) + gitlab-secret_detection (0.38.1) grpc (>= 1.63.0, < 2) grpc_reflection (~> 0.1) parallel (~> 1) @@ -831,6 +832,8 @@ GEM rspec-parameterized (>= 1.0, < 3.0) table_print (= 1.5.7) zeitwerk (>= 2, < 3) + gitlab_query_language (0.20.11) + rb_sys (~> 0.9.91) globalid (1.1.0) activesupport (>= 5.0) gon (6.5.0) @@ -889,9 +892,9 @@ GEM google-cloud-core (~> 1.6) googleauth (~> 1.9) mini_mime (~> 1.0) - google-cloud-common (1.1.0) - google-protobuf (~> 3.14) - googleapis-common-protos-types (~> 1.2) + google-cloud-common (1.9.0) + google-protobuf (>= 3.18, < 5.a) + googleapis-common-protos-types (~> 1.20) google-cloud-compute-v1 (2.6.0) gapic-common (>= 0.20.0, < 2.a) google-cloud-common (~> 1.0) @@ -921,11 +924,13 @@ GEM gapic-common (>= 0.20.0, < 2.a) google-cloud-errors (~> 1.0) google-logging-utils (0.1.0) - google-protobuf (3.25.8) - googleapis-common-protos (1.4.0) - google-protobuf (~> 3.14) - googleapis-common-protos-types (~> 1.2) - grpc (~> 1.27) + google-protobuf (4.33.1) + bigdecimal + rake (>= 13) + googleapis-common-protos (1.7.0) + google-protobuf (>= 3.18, < 5.a) + googleapis-common-protos-types (~> 1.7) + grpc (~> 1.41) googleapis-common-protos-types (1.20.0) google-protobuf (>= 3.18, < 5.a) googleauth (1.14.0) @@ -980,9 +985,9 @@ GEM grpc (1.76.0) google-protobuf (>= 3.25, < 5.0) googleapis-common-protos-types (~> 1.0) - grpc-google-iam-v1 (1.5.0) - google-protobuf (~> 3.18) - googleapis-common-protos (~> 1.4) + grpc-google-iam-v1 (1.11.0) + google-protobuf (>= 3.18, < 5.a) + googleapis-common-protos (~> 1.7.0) grpc (~> 1.41) grpc_reflection (0.1.1) grpc @@ -1002,6 +1007,7 @@ GEM guard (~> 2.1) guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) + gvltools (0.4.0) haml (5.2.2) temple (>= 0.8.0) tilt @@ -1168,7 +1174,7 @@ GEM loofah (2.24.1) crass (~> 1.0.2) nokogiri (>= 1.12.0) - lookbook (2.3.4) + lookbook (2.3.13) activemodel css_parser htmlbeautifier (~> 1.3) @@ -1231,7 +1237,9 @@ GEM net-imap (0.5.9) date net-protocol - net-ldap (0.17.1) + net-ldap (0.20.0) + base64 + ostruct net-ntp (2.1.3) net-pop (0.1.2) net-protocol @@ -1279,7 +1287,7 @@ GEM plist (~> 3.1) train-core wmi-lite (~> 1.0) - oj (3.16.11) + oj (3.16.12) bigdecimal (>= 3.0) ostruct (>= 0.2) oj-introspect (0.8.0) @@ -1537,7 +1545,7 @@ GEM date stringio public_suffix (6.0.1) - puma (6.6.1) + puma (7.1.0) nio4r (~> 2.0) pyu-ruby-sasl (0.0.3.3) raabro (1.4.0) @@ -1568,20 +1576,20 @@ GEM rackup (1.0.1) rack (< 3) webrick - rails (7.1.6) - actioncable (= 7.1.6) - actionmailbox (= 7.1.6) - actionmailer (= 7.1.6) - actionpack (= 7.1.6) - actiontext (= 7.1.6) - actionview (= 7.1.6) - activejob (= 7.1.6) - activemodel (= 7.1.6) - activerecord (= 7.1.6) - activestorage (= 7.1.6) - activesupport (= 7.1.6) + rails (7.2.3) + actioncable (= 7.2.3) + actionmailbox (= 7.2.3) + actionmailer (= 7.2.3) + actionpack (= 7.2.3) + actiontext (= 7.2.3) + actionview (= 7.2.3) + activejob (= 7.2.3) + activemodel (= 7.2.3) + activerecord (= 7.2.3) + activestorage (= 7.2.3) + activesupport (= 7.2.3) bundler (>= 1.15.0) - railties (= 7.1.6) + railties (= 7.2.3) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -1596,11 +1604,11 @@ GEM rails-i18n (7.0.10) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (7.1.6) - actionpack (= 7.1.6) - activesupport (= 7.1.6) + railties (7.2.3) + actionpack (= 7.2.3) + activesupport (= 7.2.3) cgi - irb + irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) thor (~> 1.0, >= 1.2.2) @@ -1623,7 +1631,7 @@ GEM rchardet (1.8.0) rdoc (6.13.0) psych (>= 4.0.0) - re2 (2.20.0) + re2 (2.21.0) mini_portile2 (~> 2.8.9) recaptcha (5.12.3) json @@ -1754,13 +1762,13 @@ GEM rubocop-rspec_rails (2.30.0) rubocop (~> 1.61) rubocop-rspec (~> 3, >= 3.0.1) - ruby-lsp (0.26.1) + ruby-lsp (0.26.4) language_server-protocol (~> 3.17.0) prism (>= 1.2, < 2.0) rbs (>= 3, < 5) ruby-lsp-rails (0.4.8) ruby-lsp (>= 0.26.0, < 0.27.0) - ruby-lsp-rspec (0.1.27) + ruby-lsp-rspec (0.1.28) ruby-lsp (~> 0.26.0) ruby-magic (0.6.0) mini_portile2 (~> 2.8) @@ -1814,12 +1822,6 @@ GEM shellany (0.0.1) shoulda-matchers (6.4.0) activesupport (>= 5.2.0) - sidekiq (7.3.9) - base64 - connection_pool (>= 2.3.0) - logger - rack (>= 2.2.4) - redis-client (>= 0.22.2) sidekiq-cron (1.12.0) fugit (~> 1.8) globalid (>= 1.0.1) @@ -1889,13 +1891,13 @@ GEM base64 (~> 0.1) ssrf_filter (1.0.8) stackprof (0.2.27) - state_machines (0.5.0) - state_machines-activemodel (0.8.0) - activemodel (>= 5.1) - state_machines (>= 0.5.0) - state_machines-activerecord (0.8.0) - activerecord (>= 5.1) - state_machines-activemodel (>= 0.8.0) + state_machines (0.100.4) + state_machines-activemodel (0.101.0) + activemodel (>= 7.2) + state_machines (>= 0.100.4) + state_machines-activerecord (0.100.0) + activerecord (>= 7.2) + state_machines-activemodel (>= 0.100.0) state_machines-rspec (0.6.0) activesupport rspec (~> 3.3) @@ -1929,7 +1931,7 @@ GEM unicode-display_width (>= 1.1.1, < 3) terser (1.0.2) execjs (>= 0.3.0, < 3) - test-prof (1.4.4) + test-prof (1.5.0) test_file_finder (0.3.1) faraday (>= 1.0, < 3.0, != 2.0.0) text (1.3.1) @@ -2007,7 +2009,8 @@ GEM unparser (0.6.7) diff-lcs (~> 1.3) parser (>= 3.2.0) - uri (0.13.3) + uri (1.1.1) + useragent (0.16.11) valid_email (0.1.3) activemodel mail (>= 2.6.1) @@ -2111,7 +2114,6 @@ DEPENDENCIES bcrypt (~> 3.1, >= 3.1.14) benchmark-ips (~> 2.14.0) benchmark-memory (~> 0.1) - better_errors (~> 2.10.1) bootsnap (~> 1.18.6) browser (~> 5.3.1) bullet (~> 8.0.0) @@ -2121,7 +2123,7 @@ DEPENDENCIES carrierwave (~> 1.3) charlock_holmes (~> 0.7.9) circuitbox (= 2.0.0) - click_house-client (= 0.8.2) + click_house-client (= 0.8.4) commonmarker (~> 0.23.10) concurrent-ruby (~> 1.1) connection_pool (~> 2.5.3) @@ -2133,11 +2135,10 @@ DEPENDENCIES cvss-suite (~> 3.3.0) database_cleaner-active_record (~> 2.2.0) debug (~> 1.11.0) - deckar01-task_list (= 2.3.4) declarative_policy (~> 2.0.1) deprecation_toolkit (~> 2.2.3) derailed_benchmarks - devfile (~> 0.4.8) + devfile (~> 0.5.0) device_detector devise (~> 4.9.3) devise-pbkdf2-encryptable (~> 0.0.0)! @@ -2178,7 +2179,7 @@ DEPENDENCIES gettext (~> 3.5, >= 3.5.1) gettext_i18n_rails (~> 1.13.0) git (~> 1.8) - gitaly (~> 18.6.0.pre.rc1) + gitaly (~> 18.7.0.pre.rc1) gitlab-active-context! gitlab-backup-cli! gitlab-chronic (~> 0.10.5) @@ -2186,14 +2187,14 @@ DEPENDENCIES gitlab-crystalball (~> 1.1.0) gitlab-dangerfiles (~> 4.10.0) gitlab-duo-workflow-service-client (~> 0.6)! - gitlab-experiment (~> 1.0.0) + gitlab-experiment (~> 1.1.0) gitlab-fog-azure-rm (~> 2.4.0) gitlab-glfm-markdown (~> 0.0.39) gitlab-grape-openapi! gitlab-housekeeper! gitlab-http! gitlab-kas-grpc (~> 18.5.0.pre.rc4) - gitlab-labkit (~> 0.42.2) + gitlab-labkit (~> 1.0.0) gitlab-license (~> 2.6) gitlab-mail_room (~> 0.0.24) gitlab-markup (~> 2.0.0) @@ -2212,6 +2213,7 @@ DEPENDENCIES gitlab_chronic_duration (~> 0.12) gitlab_omniauth-ldap (~> 2.3.0) gitlab_quality-test_tooling (~> 3.1.0) + gitlab_query_language (~> 0.20.11) gon (~> 6.5.0) google-apis-androidpublisher_v3 (~> 0.86.0) google-apis-cloudbilling_v1 (~> 0.22.0) @@ -2228,7 +2230,7 @@ DEPENDENCIES google-cloud-bigquery (~> 1.0) google-cloud-compute-v1 (~> 2.6.0) google-cloud-storage (~> 1.57.0) - google-protobuf (~> 3.25, >= 3.25.3) + google-protobuf (>= 3.25, < 5.0) googleauth (~> 1.14) gpgme (~> 2.0.24) grape (~> 2.0.0) @@ -2243,6 +2245,7 @@ DEPENDENCIES grpc (~> 1.76.0) gssapi (~> 1.3.1) guard-rspec + gvltools (~> 0.4.0) haml_lint (~> 0.58) hamlit (~> 3.0.0) hashdiff (~> 1.2.0) @@ -2287,9 +2290,8 @@ DEPENDENCIES mini_magick (~> 4.12) minitest (~> 5.11.0) multi_json (~> 1.17.0) - mutex_m (~> 0.3) net-http (= 0.6.0) - net-ldap (~> 0.17.1) + net-ldap (~> 0.20.0) net-ntp net-protocol (~> 0.2.2) nkf (~> 0.2.0) @@ -2356,14 +2358,14 @@ DEPENDENCIES pry-byebug pry-rails (~> 0.3.9) pry-shell (~> 0.6.4) - puma (= 6.6.1) + puma (~> 7.1) rack (~> 2.2.9) rack-attack (~> 6.8.0) rack-cors (~> 2.0.1) rack-oauth2 (~> 2.2.1) rack-proxy (~> 0.7.7) rack-timeout (~> 0.7.0) - rails (~> 7.1.6) + rails (~> 7.2.3) rails-controller-testing rails-i18n (~> 7.0, >= 7.0.9) rainbow (~> 3.0) @@ -2388,9 +2390,9 @@ DEPENDENCIES rspec_junit_formatter rspec_profiling (~> 0.0.9) rubocop - ruby-lsp (~> 0.26.0) + ruby-lsp (~> 0.26.4) ruby-lsp-rails (~> 0.4.8) - ruby-lsp-rspec (~> 0.1.27) + ruby-lsp-rspec (~> 0.1.28) ruby-magic (~> 0.6) ruby-progressbar (~> 1.10) ruby-saml (~> 1.18) @@ -2405,7 +2407,7 @@ DEPENDENCIES sentry-ruby (~> 5.23.0) sentry-sidekiq (~> 5.23.0) shoulda-matchers (~> 6.4.0) - sidekiq (~> 7.3.9) + sidekiq! sidekiq-cron (~> 1.12.0) sigdump (~> 0.2.4) simple_po_parser (~> 1.1.6) @@ -2424,13 +2426,13 @@ DEPENDENCIES sprockets-rails (~> 3.5.1) ssh_data (~> 2.0) stackprof (~> 0.2.26) - state_machines-activerecord (~> 0.8.0) + state_machines-activerecord (~> 0.100.0) state_machines-rspec (~> 0.6) sys-filesystem (~> 1.4.3) tanuki_emoji (~> 0.13) telesignenterprise (~> 2.6) terser (= 1.0.2) - test-prof (~> 1.4.0) + test-prof (~> 1.5.0) test_file_finder (~> 0.3.1) thrift (~> 0.22.0) timfel-krb5-auth (~> 0.8) @@ -2441,7 +2443,7 @@ DEPENDENCIES undercover (~> 0.7.0) unicode-emoji (~> 4.0) unleash (~> 3.2.2) - uri (= 0.13.3) + uri (~> 1.1.1) valid_email (~> 0.1) validates_hostname (~> 1.0.13) version_sorter (~> 2.3) diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix index 93a3ab931a76..b5ed1f37df5f 100644 --- a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix +++ b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix @@ -9,10 +9,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1g93cpxhk3n0lp42accb7b76km2di300lw9zpsrb2rigvnjmw3h6"; + sha256 = "0gikb7zms7bg3621ipkk1carbzvwiybqbvnci1yrsh7r0fb0zd8x"; type = "gem"; }; - version = "2.0.26"; + version = "2.0.27"; }; actioncable = { dependencies = [ @@ -30,10 +30,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1nn30fnsbqhx3yyy6vf7wxcqz3fnv7rkrbi010b5414119gqshmd"; + sha256 = "1yfl7blz9zlww0al921kmyqsmsx8gdphqjnszp5fgpzi8nr1fpg1"; type = "gem"; }; - version = "7.1.6"; + version = "7.2.3"; }; actionmailbox = { dependencies = [ @@ -43,9 +43,6 @@ src: { "activestorage" "activesupport" "mail" - "net-imap" - "net-pop" - "net-smtp" ]; groups = [ "default" @@ -55,10 +52,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0cgpq8xn5apfrx89pc3phwcayqvhy10kb0sm8pqsaiy1isnminfy"; + sha256 = "0pjdrdlv14mzq24qx95hpxhfza0k72qc3qymaa6x1wihqfkz1fqn"; type = "gem"; }; - version = "7.1.6"; + version = "7.2.3"; }; actionmailer = { dependencies = [ @@ -67,9 +64,6 @@ src: { "activejob" "activesupport" "mail" - "net-imap" - "net-pop" - "net-smtp" "rails-dom-testing" ]; groups = [ @@ -80,10 +74,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0wyj251glxf2n00k6yc29r8dbys9b03mr8x5knd2kgb6xhh68zxh"; + sha256 = "1f4axhrdhk9z3hjv6xzxqyj7c3y17mn7kz1li1fv5lm6aaw4dmk8"; type = "gem"; }; - version = "7.1.6"; + version = "7.2.3"; }; actionpack = { dependencies = [ @@ -97,6 +91,7 @@ src: { "rack-test" "rails-dom-testing" "rails-html-sanitizer" + "useragent" ]; groups = [ "default" @@ -106,10 +101,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1sq328ark8wa4c8x3y3nsv9qfysjbnn3bv8ily83dz6wdyijv91z"; + sha256 = "1kq7fbgb5yfsjd1na2ghc7assk18ca24kbvsx90p0xwm8v3f851a"; type = "gem"; }; - version = "7.1.6"; + version = "7.2.3"; }; actiontext = { dependencies = [ @@ -128,10 +123,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0rky5702sixkxb04fmpsyycqdv49kpn7nsl68v5whz6n5m15gmkr"; + sha256 = "0ds0m7qp55qkprhdkzpxrvbfiam95s58xj7555hf5d5pnzpxkzx6"; type = "gem"; }; - version = "7.1.6"; + version = "7.2.3"; }; actionview = { dependencies = [ @@ -151,10 +146,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0rpmxm1vvga9jjym371h9q26wi4gdxf80xra5c3awr84z60ps50i"; + sha256 = "1cpc91crvavdgvc3jqj1nqr9q6s581bm64894pbh8f5l85x7shhz"; type = "gem"; }; - version = "7.1.6"; + version = "7.2.3"; }; activejob = { dependencies = [ @@ -169,10 +164,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1fyc5paw29kwc6v5mqvpvd8354y3c4z3l8nrkls0hij93l2wvn8d"; + sha256 = "1c7zwmhkg9fpkl2isiggs9b2xbf8jf0hhbvmjfgbcrz25m3n8jg4"; type = "gem"; }; - version = "7.1.6"; + version = "7.2.3"; }; activemodel = { dependencies = [ "activesupport" ]; @@ -185,10 +180,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "08g7lar9g9bqlvmhyc8bsvp0kzs18hhqiz1zksbbaq5530052bzp"; + sha256 = "1nrr8w3hxkssgx13bcph8lb876hg57w01fbapy7fj4ijp6p6dbxv"; type = "gem"; }; - version = "7.1.6"; + version = "7.2.3"; }; activerecord = { dependencies = [ @@ -205,10 +200,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0yghfgk627mc5gf5p549ilhs2hvjs5ms81dvkrixhzn9gz6ri8hs"; + sha256 = "1mx087zngip62400z44p969l6fja1fjxliq6kym6npzbii3vgb3g"; type = "gem"; }; - version = "7.1.6"; + version = "7.2.3"; }; activerecord-gitlab = { dependencies = [ "activerecord" ]; @@ -236,10 +231,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "167k9fgv7ymvrk737mf5zwfl8za7qhxajgdwkhypifljcn7cn6ig"; + sha256 = "0bya6k7i8s6538fa4j2c0a0xrf6kggg8mhrwnkkqj356zaxj452c"; type = "gem"; }; - version = "7.1.6"; + version = "7.2.3"; }; activesupport = { dependencies = [ @@ -252,7 +247,6 @@ src: { "i18n" "logger" "minitest" - "mutex_m" "securerandom" "tzinfo" ]; @@ -265,10 +259,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0z1szpkxgxkq4ckgl4n51y2g3bi9f5a3wri2lci4j71vh45184kz"; + sha256 = "043vbilaw855c91n5l7g0k0wxj63kngj911685qy74xc1mvwjxan"; type = "gem"; }; - version = "7.1.6"; + version = "7.2.3"; }; addressable = { dependencies = [ "public_suffix" ]; @@ -820,21 +814,6 @@ src: { }; version = "0.4.0"; }; - better_errors = { - dependencies = [ - "erubi" - "rack" - "rouge" - ]; - groups = [ "development" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0wqazisnn6hn1wsza412xribpw5wzx6b5z5p4mcpfgizr6xg367p"; - type = "gem"; - }; - version = "2.10.1"; - }; bigdecimal = { groups = [ "coverage" @@ -1165,10 +1144,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1k35sm731qmxznzyhjcbqlypf070radmd4ai0i8yn4dzl4bmdqj9"; + sha256 = "067xbpp8ihfnzq7cnj1m9xnrm08ng8jdm2jfvnsqq3nkkwqscy42"; type = "gem"; }; - version = "0.8.2"; + version = "0.8.4"; }; coderay = { groups = [ @@ -1558,17 +1537,6 @@ src: { }; version = "1.1.0"; }; - deckar01-task_list = { - dependencies = [ "html-pipeline" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0rqn9jh45gsw045c6fm05875bpj2xbhnff5m5drmk9wy01zdrav6"; - type = "gem"; - }; - version = "2.3.4"; - }; declarative = { groups = [ "default" ]; platforms = [ ]; @@ -1651,10 +1619,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1nnd5jbasxvk9wjjy68yymd98ah8wjzkrpskvs74djl8rj8yzj6j"; + sha256 = "1kycnkmlfzch27kcwr8ch7756rjvv1plvv34idllnsrykvhknzka"; type = "gem"; }; - version = "0.4.8"; + version = "0.5.0"; }; device_detector = { groups = [ "default" ]; @@ -2544,10 +2512,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "18m71bpib6x9shbjhmzww28pas15abngah7vmrkfigfnw5ccsjyf"; + sha256 = "19crlx2pnyxa8ncv874gz652hxh6yd9lr1354yznrgkqv5p37ir0"; type = "gem"; }; - version = "3.33.0"; + version = "3.33.1"; }; fog-core = { dependencies = [ @@ -2585,15 +2553,17 @@ src: { ]; groups = [ "default" + "development" + "monorepo" "test" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "13z1ghq9ifd1n2yp1srf7r03hw7y5hl52frarbb8x4zmmfqa7bjq"; + sha256 = "1bf6sxq6wym9hg4y1ln4bjmgi7fwmaalim70hhdadj4862nxwbr3"; type = "gem"; }; - version = "1.25.0"; + version = "1.26.0"; }; fog-json = { dependencies = [ @@ -2688,6 +2658,8 @@ src: { dependencies = [ "faraday" "faraday-retry" + "google-cloud-env" + "google-logging-utils" "google-protobuf" "googleapis-common-protos" "googleapis-common-protos-types" @@ -2698,10 +2670,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0rlka373b2iva4dz2diz2zx7jyx617hwqvnfx2hs5xs0nh24fc5g"; + sha256 = "1phdqrnzf849ds03qmsfn4c3wqnfd5rjc17w1vcfxmxyxcgfqxxl"; type = "gem"; }; - version = "0.20.0"; + version = "1.2.0"; }; gdk-toogle = { dependencies = [ @@ -2802,10 +2774,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0xn347pk7zkks3zhzi73s2zg8ps5cbc8z6y0k678iafpsbnj0ayc"; + sha256 = "0a17fm4z0kdrmkszaf6cs8z28z4v27awg78wfn88pg33diqbhy1p"; type = "gem"; }; - version = "18.6.0.pre.rc1"; + version = "18.7.0.pre.rc1"; }; gitlab = { dependencies = [ @@ -2959,10 +2931,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1fgar7p0rpi0ycqdccrzxz8lvxzm78zi95xy642jy09hbpjnzxwz"; + sha256 = "0hz240khah65vlk6b4b6zqhbrg394dwyp6h5526krniymfla9i9k"; type = "gem"; }; - version = "1.0.0"; + version = "1.1.0"; }; gitlab-fog-azure-rm = { dependencies = [ @@ -3070,10 +3042,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0pa92lw9s9nz4xdv4hlh381niq8kj4lxdpafnkjhimfka8iibb63"; + sha256 = "1cpc2cq1dwzp19plk9nms2qblk82w2j1xlmz4b38v2csx8lladbg"; type = "gem"; }; - version = "0.42.2"; + version = "1.0.1"; }; gitlab-license = { groups = [ "default" ]; @@ -3127,6 +3099,7 @@ src: { dependencies = [ "activerecord" "activesupport" + "gitlab_quality-test_tooling" "rspec" ]; groups = [ @@ -3213,10 +3186,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0v22xi0pvdnpzszlqhlc5xi547amlrs7a9s6qzygc07mnwbvzihj"; + sha256 = "1j8m7bpikr8gcq92xlqia6dk9l17ncd21i13phd2x2m3sydi5m0w"; type = "gem"; }; - version = "0.38.0"; + version = "0.38.1"; }; gitlab-security_report_schemas = { dependencies = [ @@ -3348,6 +3321,17 @@ src: { }; version = "3.1.0"; }; + gitlab_query_language = { + dependencies = [ "rb_sys" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "06al6my37q7mxjdjvzk4qlyj1lklrwny8zrz6400m5013wrgm00y"; + type = "gem"; + }; + version = "0.20.11"; + }; globalid = { dependencies = [ "activesupport" ]; groups = [ @@ -3622,10 +3606,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1yxmdxx933q48397jsczsmpshr4b61izv3spnhvzxd24s67v13bk"; + sha256 = "0b58lwr678swr2cgyahvr7bhjjnv34q5p3ph3mbhady2067894x5"; type = "gem"; }; - version = "1.1.0"; + version = "1.9.0"; }; google-cloud-compute-v1 = { dependencies = [ @@ -3756,6 +3740,10 @@ src: { version = "0.1.0"; }; google-protobuf = { + dependencies = [ + "bigdecimal" + "rake" + ]; groups = [ "default" "development" @@ -3765,10 +3753,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1dsj349xm6jmd94xix8bgdn5m8jqqk9bsivlm9fll8ifa008ab0h"; + sha256 = "1v24iiaz12rpvknn8k279db0y2is275qzrs2s0zhmcq0gamvrnc1"; type = "gem"; }; - version = "3.25.8"; + version = "4.33.1"; }; googleapis-common-protos = { dependencies = [ @@ -3780,10 +3768,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "10p3kl9xdxl4xsijkj2l6qn525xchkbfhx3ch603ammibbxq08ys"; + sha256 = "0hcj5hxihv6jxfzw3bpp3yih2yippg50sknnkaw6n340w6ww115n"; type = "gem"; }; - version = "1.4.0"; + version = "1.7.0"; }; googleapis-common-protos-types = { dependencies = [ "google-protobuf" ]; @@ -4013,10 +4001,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0kip34n9604j2cc9rkplv5ljq0n8f4aizix4yr8rginsa38md8yf"; + sha256 = "131n7w17zb5gl6pk8lv7zd95fi507bj327snn4f00giva2lah2lg"; type = "gem"; }; - version = "1.5.0"; + version = "1.11.0"; }; grpc_reflection = { dependencies = [ "grpc" ]; @@ -4091,6 +4079,16 @@ src: { }; version = "4.7.3"; }; + gvltools = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0pln2rk28z4yvfpsl56hprhzla77xapppwnlbfc2n6lk8bzjnq6w"; + type = "gem"; + }; + version = "0.4.0"; + }; haml = { dependencies = [ "temple" @@ -5032,10 +5030,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "01bni0dlqc9blb1akqsna39l2wb9a9dgv75mqhihrb0lnng4qj0n"; + sha256 = "08bd7wvwhi1kk687bsa94pslcdbnf8nqmmr2q9bv11vspahh9ymc"; type = "gem"; }; - version = "2.3.4"; + version = "2.3.13"; }; lru_redux = { groups = [ "default" ]; @@ -5510,14 +5508,18 @@ src: { version = "0.5.9"; }; net-ldap = { + dependencies = [ + "base64" + "ostruct" + ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1ycw0qsw3hap8svakl0i30jkj0ffd4lpyrn17a1j0w8mz5ainmsj"; + sha256 = "0wjkrvcwnxa6ggq0nfz004f1blm1c67fv7c6614sraak0wshn25j"; type = "gem"; }; - version = "0.17.1"; + version = "0.20.0"; }; net-ntp = { groups = [ "default" ]; @@ -5782,10 +5784,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1cajn3ylwhby1x51d9hbchm964qwb5zp63f7sfdm55n85ffn1ara"; + sha256 = "0mmmswza8f4divl0mvkfq62pcdvm8c56j854wv7z9g6s0rmav7xd"; type = "gem"; }; - version = "3.16.11"; + version = "3.16.12"; }; oj-introspect = { dependencies = [ "oj" ]; @@ -7047,10 +7049,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "07pajhv7pqz82kcjc6017y4d0hwz5kp746cydpx1npd79r56xddr"; + sha256 = "1pa9zpr51kqnsq549p6apvnr95s9flx6bnwqii24s8jg2b5i0p74"; type = "gem"; }; - version = "6.6.1"; + version = "7.1.0"; }; pyu-ruby-sasl = { groups = [ "default" ]; @@ -7252,10 +7254,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0w3librd55ifs5za27afch673zyqycd7kka2fnnxmqqda5g362ls"; + sha256 = "1zwvc2fa0hm27ygfz1yc2bs52h4wzj1nhpv6cip6g28i2gmi564s"; type = "gem"; }; - version = "7.1.6"; + version = "7.2.3"; }; rails-controller-testing = { dependencies = [ @@ -7345,10 +7347,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "076ywx2xs824c8bgy0fgshlfxri6v3sb3x7yy08nv9mc5rzyj41a"; + sha256 = "08h44mkf91861agp7xw778gqpf5mppydsfgphgkj7wp6pyk11c3f"; type = "gem"; }; - version = "7.1.6"; + version = "7.2.3"; }; rainbow = { groups = [ @@ -7492,10 +7494,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1hpkh647ffsqhnj4ps85n2v4d116fg3250m9y7pcnc55lxl6nda5"; + sha256 = "1q86axcrrl9sh7wgnc70mb8kcyg2qjb67a2wm2qhfh9jqx12k4xg"; type = "gem"; }; - version = "2.20.0"; + version = "2.21.0"; }; recaptcha = { dependencies = [ "json" ]; @@ -8212,10 +8214,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "050qg73g4qs3xza441nafy7610daa3k4ra0pbi3sdlawy9fwfh6i"; + sha256 = "1xx96yfi5aqm1d3aps2nl5mls0vnm8xwvw75vy1ik3vc0rm09cqw"; type = "gem"; }; - version = "0.26.1"; + version = "0.26.4"; }; ruby-lsp-rails = { dependencies = [ "ruby-lsp" ]; @@ -8234,10 +8236,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "09wqhrrkfhbjy8yxkp1bn9rmrdcjp85j3lisvwp1qp7jz18yk0bm"; + sha256 = "14gl3g8gg8p8zknd07hkzrrgaqqq184pj7l3nw7dgih8pbzv7cqd"; type = "gem"; }; - version = "0.1.27"; + version = "0.1.28"; }; ruby-magic = { dependencies = [ "mini_portile2" ]; @@ -8580,9 +8582,8 @@ src: { groups = [ "default" ]; platforms = [ ]; source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "19xm4s49hq0kpfbmvhnjskzmfjjxw5d5sm7350mh12gg3lp7220i"; - type = "gem"; + path = "${src}/vendor/gems/sidekiq"; + type = "path"; }; version = "7.3.9"; }; @@ -8946,14 +8947,17 @@ src: { version = "0.2.27"; }; state_machines = { - groups = [ "default" ]; + groups = [ + "default" + "test" + ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "00mi16hg3rhkxz4y58s173cbnjlba41y9bfcim90p4ja6yfj9ri3"; + sha256 = "0r95flfng5wnb8qhr6mq0rivw40xnlwmz2p1izfnj586pdg5aknx"; type = "gem"; }; - version = "0.5.0"; + version = "0.100.4"; }; state_machines-activemodel = { dependencies = [ @@ -8964,10 +8968,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0b4dffzlj38adin6gm0ky72r5c507qdb1jprnm7h9gnlj2qxlcp9"; + sha256 = "0bgprpi8kcaqd27ymm4b2ixfxswrr54kjqya00d2pgm4bazwd637"; type = "gem"; }; - version = "0.8.0"; + version = "0.101.0"; }; state_machines-activerecord = { dependencies = [ @@ -8978,10 +8982,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1dmaf4f4cg3gamzgga3gamp0kv9lvianqzr9103dw0xbp00vfbq7"; + sha256 = "1ddyhj1y49yfa3czg3847zxhyjn6if4yhfaivs96sb7kyds3y8dj"; type = "gem"; }; - version = "0.8.0"; + version = "0.100.0"; }; state_machines-rspec = { dependencies = [ @@ -9207,10 +9211,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1vsk2ca9kfrxhyd2xiiyr28hmxkh9vd8j2vwl5f1yfnkv4z52n8s"; + sha256 = "1s7asi66mhpraw3p8a5aciwzi2iwwsiwj0a97b7x5z8ncbi7nj6s"; type = "gem"; }; - version = "1.4.4"; + version = "1.5.0"; }; test_file_finder = { dependencies = [ "faraday" ]; @@ -9720,15 +9724,30 @@ src: { "danger" "default" "development" + "monorepo" "test" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "19qy5sdl7c7h793r8dy8r06avz7y4srwqvaxlhvj8q3kbg0naigd"; + sha256 = "1ijpbj7mdrq7rhpq2kb51yykhrs2s54wfs6sm9z3icgz4y6sb7rp"; type = "gem"; }; - version = "0.13.3"; + version = "1.1.1"; + }; + useragent = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0i1q2xdjam4d7gwwc35lfnz0wyyzvnca0zslcfxm9fabml9n83kh"; + type = "gem"; + }; + version = "0.16.11"; }; valid_email = { dependencies = [ diff --git a/pkgs/by-name/gi/gitlab/update.py b/pkgs/by-name/gi/gitlab/update.py index 7440493f65ab..cb0de7ed1bec 100755 --- a/pkgs/by-name/gi/gitlab/update.py +++ b/pkgs/by-name/gi/gitlab/update.py @@ -182,21 +182,6 @@ def update_rubyenv(): cwd=rubyenv_dir, ) - # Un-vendor sidekiq - # - # The sidekiq dependency was vendored to maintain compatibility with Redis 6.0 (as - # stated in this [comment]) but unfortunately, it seems to cause a crash in the - # application, as noted in this [upstream issue]. - # - # We can safely swap out the dependency, as our Redis release in nixpkgs is >= 7.0. - # - # [comment]: https://gitlab.com/gitlab-org/gitlab/-/issues/468435#note_1979750600 - # [upstream issue]: https://gitlab.com/gitlab-org/gitlab/-/issues/468435 - subprocess.check_output( - ["sed", "-i", "s|gem 'sidekiq', path: 'vendor/gems/sidekiq', require: 'sidekiq'|gem 'sidekiq', '~> 7.3.9'|g", "Gemfile"], - cwd=rubyenv_dir, - ) - # Fetch vendored dependencies temporarily in order to build the gemset.nix subprocess.check_output(["mkdir", "-p", "vendor/gems", "gems"], cwd=rubyenv_dir) subprocess.check_output(