From f4187309deafbdfaf59b9bd7997c2c42dd7756e8 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Fri, 18 Jul 2025 12:58:33 +0200 Subject: [PATCH] gitlab: 18.1.2 -> 18.2.0 https://about.gitlab.com/releases/2025/07/17/gitlab-18-2-released/ --- pkgs/by-name/gi/gitaly/package.nix | 6 +- .../gi/gitlab-container-registry/package.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 | 18 +-- .../gi/gitlab/gitlab-workhorse/default.nix | 4 +- pkgs/by-name/gi/gitlab/rubyEnv/Gemfile | 26 ++- pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock | 104 ++++++------ pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix | 151 +++++++----------- 10 files changed, 139 insertions(+), 194 deletions(-) diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix index f27132f57d2a..4d844474cb7d 100644 --- a/pkgs/by-name/gi/gitaly/package.nix +++ b/pkgs/by-name/gi/gitaly/package.nix @@ -7,7 +7,7 @@ }: let - version = "18.1.2"; + version = "18.2.0"; 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-ErA04W6rWsjSay02bst0ur1mztrdo8SW/mpGtln4unI="; + hash = "sha256-e78kokFzVqFGgurlqThxHhfrGiRuZ+XG2g5hRrCuF3Y="; }; - vendorHash = "sha256-BTpcnaHNyLgdAA9KqqA+mBo18fmQ0+OwLGNOPHRJ/IE="; + vendorHash = "sha256-RjDV4NGmmdT9STQBHiYf3UUYwPmuSg6970/W/ekxin0="; 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 d5013e8d13d6..217966c4b1eb 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 @@ buildGoModule rec { pname = "gitlab-container-registry"; - version = "4.24.0"; + version = "4.25.0"; rev = "v${version}-gitlab"; # nixpkgs-update: no auto update @@ -14,10 +14,10 @@ buildGoModule rec { owner = "gitlab-org"; repo = "container-registry"; inherit rev; - hash = "sha256-GNL7L6DKIKEgDEZQkeHNOn4R5SnWnHvNoUIs2YLjoR8="; + hash = "sha256-7jzKFC29NAHi5iag6aA/5LzH6IyqMa3yAxtzV9OsBnQ="; }; - vendorHash = "sha256-zisadCxyfItD/n7VGbtbvhl8MRHiqdw0Kkrg6ebgS/8="; + vendorHash = "sha256-z9IlfyJ48FQzhbY38GbZaeQjg3cMDU8tLCXKhazP64A="; checkFlags = let diff --git a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix index 3befb216c4c2..ea5fad14c940 100644 --- a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix +++ b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix @@ -8,17 +8,17 @@ buildGoModule rec { pname = "gitlab-elasticsearch-indexer"; - version = "5.6.0"; + version = "5.7.0"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-elasticsearch-indexer"; rev = "v${version}"; - hash = "sha256-XerIPK+s0OWYAqKVqE3HSSI+D4cXixYqRHmf9/4C2eg="; + hash = "sha256-Qlz8YT6lGUtnMXCrfZZjzmSz0AivzcCVEd/tEKzfoYg="; }; - vendorHash = "sha256-qNGACM5DKufyNVKhJyakmMRbaMXi+JJUfojhWdk0ptU="; + vendorHash = "sha256-C0B9fe/S5TODgVTMGBBD5oGH/DsxAvCB6tBLaRdswCA="; 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 d21dba50c838..b0e6e6dad31e 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.1.2"; + version = "18.2.0"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-XY/WK19nujQPdsicGDHS5gEZf3uJZdW41R4xK9hDML0="; + hash = "sha256-TcDk816n4483SzTuz5bc8e2efrd2eJdM8jWXpM3DMvY="; }; - vendorHash = "sha256-6ZHKwPhC3N813kiw1NnPOMVc2CBSIClwc4MunDi0gCk="; + vendorHash = "sha256-OubXCpvGtGqegQmdb6R1zw/0DfQ4FdbJGt7qYYRnWnA="; subPackages = [ "." ]; meta = { diff --git a/pkgs/by-name/gi/gitlab-shell/package.nix b/pkgs/by-name/gi/gitlab-shell/package.nix index 2bc9ba46c36a..c12daca4cdc3 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.42.0"; + version = "14.43.0"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - hash = "sha256-U42xSb9kZpxBIE+tua5m3iNMBfcLRlujSI3K5eWiuME="; + hash = "sha256-JBcfsOLutxHUk5z+vXP8CnVSmJazhqJk4fZ0vONIswo="; }; buildInputs = [ @@ -27,7 +27,7 @@ buildGoModule rec { ./remove-hardcoded-locations.patch ]; - vendorHash = "sha256-aBANgvo9kWiHoytaB10J3hf9vOWVsz/vJApVHet93xg="; + vendorHash = "sha256-zuxgWBrrftkNjMhAXs8cAcQmb8RLQqvnFhU0HnUUcTA="; subPackages = [ "cmd/gitlab-shell" diff --git a/pkgs/by-name/gi/gitlab/data.json b/pkgs/by-name/gi/gitlab/data.json index 7e6ef7cd5e0f..aa76ef74a44a 100644 --- a/pkgs/by-name/gi/gitlab/data.json +++ b/pkgs/by-name/gi/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "18.1.2", - "repo_hash": "072ib6rc7mw9pdzql8514k4z76i1ahssyj5kypgyvf9qj4naym0b", - "yarn_hash": "0c5pp3dpvw0q0nfl6w1lpdmk7dvkfinwb7z7a3vq22wgzca23x2m", + "version": "18.2.0", + "repo_hash": "0wkxnhrxq3x2ahbb1hffd2c321mz3y1wi7qh89drg8rn4qgz09cd", + "yarn_hash": "04mqinnbhr6zgab2p1bq6y6b20bf4c4cynkgfc67mzm9xhybr3fk", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v18.1.2-ee", + "rev": "v18.2.0-ee", "passthru": { - "GITALY_SERVER_VERSION": "18.1.2", - "GITLAB_PAGES_VERSION": "18.1.2", - "GITLAB_SHELL_VERSION": "14.42.0", - "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.6.0", - "GITLAB_WORKHORSE_VERSION": "18.1.2" + "GITALY_SERVER_VERSION": "18.2.0", + "GITLAB_PAGES_VERSION": "18.2.0", + "GITLAB_SHELL_VERSION": "14.43.0", + "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.7.0", + "GITLAB_WORKHORSE_VERSION": "18.2.0" } } diff --git a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix index d32d1530b2ce..c8f129daff95 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.1.2"; + version = "18.2.0"; # nixpkgs-update: no auto update src = fetchFromGitLab { @@ -22,7 +22,7 @@ buildGoModule rec { sourceRoot = "${src.name}/workhorse"; - vendorHash = "sha256-jsp68duGIW1p8ltfSlK0jPd22iscjiIOyrxfsr+2QY0="; + vendorHash = "sha256-fJ1QqVn2t591ZQv9ilwgk+sPwNZNy6bHvpdCPs7S0+s="; buildInputs = [ git ]; ldflags = [ "-X main.Version=${version}" ]; doCheck = false; diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile index b8cd3db40e42..40f61b9e6d0b 100644 --- a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile +++ b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile @@ -7,7 +7,7 @@ end source 'https://rubygems.org' if ENV.fetch('BUNDLER_CHECKSUM_VERIFICATION_OPT_IN', 'false') != 'false' # this verification is still experimental - $LOAD_PATH.unshift(File.expand_path("vendor/gems/bundler-checksum/lib", __dir__)) + $LOAD_PATH.unshift(File.expand_path("gems/bundler-checksum/lib", __dir__)) require 'bundler-checksum' BundlerChecksum.patch! end @@ -21,7 +21,7 @@ end extend ignore_feature_category -gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', require: false, feature_category: :shared +gem 'bundler-checksum', '~> 0.1.0', path: 'gems/bundler-checksum', require: false, feature_category: :shared # See https://docs.gitlab.com/ee/development/gemfile.html#upgrade-rails for guidelines when upgrading Rails @@ -37,7 +37,7 @@ gem 'mutex_m', '~> 0.3', feature_category: :shared # Need by Rails gem 'drb', '~> 2.2', feature_category: :shared -gem 'bootsnap', '~> 1.18.3', require: false, feature_category: :shared +gem 'bootsnap', '~> 1.18.6', require: false, feature_category: :shared # 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 @@ -344,9 +344,6 @@ gem 'atlassian-jwt', '~> 0.2.1', feature_category: :integrations # Slack integration gem 'slack-messenger', '~> 2.3.5', feature_category: :integrations -# FogBugz integration -gem 'ruby-fogbugz', '~> 0.3.0', feature_category: :importers - # Kubernetes integration gem 'kubeclient', '~> 4.11.0', feature_category: :shared @@ -404,7 +401,7 @@ gem 'gitlab-schema-validation', path: 'gems/gitlab-schema-validation', feature_c gem 'gitlab-http', path: 'gems/gitlab-http', feature_category: :shared gem 'premailer-rails', '~> 1.12.0', feature_category: :notifications -gem 'gitlab-labkit', '~> 0.37.0', feature_category: :shared +gem 'gitlab-labkit', '~> 0.39.0', feature_category: :shared gem 'thrift', '>= 0.16.0', feature_category: :shared # I18n @@ -422,10 +419,6 @@ gem 'tty-prompt', '~> 0.23', require: false, feature_category: :shared # Perf bar gem 'peek', '~> 1.1', feature_category: :shared -# Google Cloud Profiler support -gem 'cloud_profiler_agent', '~> 0.0.0', path: 'vendor/gems/cloud_profiler_agent', require: false, - feature_category: :shared - # Snowplow events trackin gem 'snowplow-tracker', '~> 0.8.0', feature_category: :product_analytics @@ -438,7 +431,7 @@ gem 'prometheus-client-mmap', '~> 1.2.9', require: 'prometheus/client', feature_ gem 'async', '~> 2.24.0', require: false, feature_category: :shared # Security report schemas used to validate CI job artifacts of security jobs -gem 'gitlab-security_report_schemas', '0.1.2.min15.0.0.max15.2.1', feature_category: :vulnerability_management +gem 'gitlab-security_report_schemas', '0.1.3.min15.0.0.max15.2.2', feature_category: :vulnerability_management # OpenTelemetry group :opentelemetry do @@ -515,7 +508,7 @@ group :development, :test do gem 'database_cleaner-active_record', '~> 2.2.0', feature_category: :database gem 'rspec-rails', '~> 7.1.0', feature_category: :shared - gem 'factory_bot_rails', '~> 6.4.3', feature_category: :tooling + 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 @@ -565,7 +558,7 @@ group :development, :test, :coverage do gem 'simplecov', '~> 0.22', require: false, feature_category: :tooling gem 'simplecov-lcov', '~> 0.8.0', require: false, feature_category: :tooling gem 'simplecov-cobertura', '~> 2.1.0', require: false, feature_category: :tooling - gem 'undercover', '~> 0.6.0', require: false, feature_category: :tooling + gem 'undercover', '~> 0.7.0', require: false, feature_category: :tooling end # Gems required in omnibus-gitlab pipeline @@ -646,7 +639,7 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat gem 'gitaly', '~> 18.1.0.pre.rc1', feature_category: :gitaly # KAS GRPC protocol definitions -gem 'gitlab-kas-grpc', '~> 17.11.0', feature_category: :deployment_management +gem 'gitlab-kas-grpc', '~> 18.1.0', feature_category: :deployment_management # Lock until 1.74.0 is available # https://gitlab.com/gitlab-com/gl-infra/production/-/issues/20067 @@ -728,6 +721,7 @@ gem 'arr-pm', '~> 0.0.12', feature_category: :package_registry # Remote Development gem 'devfile', '~> 0.4.4', feature_category: :workspaces +gem 'hashdiff', '~> 1.2.0', feature_category: :workspaces # Apple plist parsing gem 'CFPropertyList', '~> 3.0.0', feature_category: :mobile_devops @@ -758,4 +752,4 @@ gem 'paper_trail', '~> 16.0', feature_category: :shared gem "i18n_data", "~> 0.13.1", feature_category: :system_access -gem "gitlab-cloud-connector", "~> 1.14", require: 'gitlab/cloud_connector', feature_category: :cloud_connector +gem "gitlab-cloud-connector", "~> 1.21", require: 'gitlab/cloud_connector', feature_category: :plan_provisioning diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock index e5a452a4d519..7b7363c6267c 100644 --- a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock @@ -4,6 +4,12 @@ PATH activerecord-gitlab (0.2.0) activerecord (>= 7) +PATH + remote: gems/bundler-checksum + specs: + bundler-checksum (0.1.0) + bundler + PATH remote: gems/click_house-client specs: @@ -126,21 +132,6 @@ PATH diffy (~> 3.4) oj (~> 3.16, >= 3.16.10) -PATH - remote: vendor/gems/bundler-checksum - specs: - bundler-checksum (0.1.0) - bundler - -PATH - remote: vendor/gems/cloud_profiler_agent - specs: - cloud_profiler_agent (0.0.1.pre) - google-cloud-profiler-v2 (~> 0.3) - google-protobuf (~> 3.25) - googleauth (>= 0.14) - stackprof (~> 0.2) - PATH remote: vendor/gems/devise-pbkdf2-encryptable specs: @@ -217,8 +208,8 @@ GEM nkf rexml RedCloth (4.3.4) - acme-client (2.0.21) - base64 (~> 0.2.0) + acme-client (2.0.22) + base64 (~> 0.2) faraday (>= 1.0, < 3.0.0) faraday-retry (>= 1.0, < 3.0.0) actioncable (7.1.5.1) @@ -343,8 +334,8 @@ GEM awrence (1.2.1) aws-eventstream (1.3.0) aws-partitions (1.1001.0) - aws-sdk-cloudformation (1.131.0) - aws-sdk-core (~> 3, >= 3.216.0) + aws-sdk-cloudformation (1.133.0) + aws-sdk-core (~> 3, >= 3.225.0) aws-sigv4 (~> 1.5) aws-sdk-core (3.225.0) aws-eventstream (~> 1, >= 1.3.0) @@ -446,7 +437,7 @@ GEM descendants_tracker (~> 0.0.1) colored2 (3.1.2) commonmarker (0.23.11) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.5) connection_pool (2.5.3) console (1.29.2) fiber-annotation @@ -489,7 +480,7 @@ GEM danger-gitlab (8.0.0) danger gitlab (~> 4.2, >= 4.2.0) - database_cleaner-active_record (2.2.0) + database_cleaner-active_record (2.2.1) activerecord (>= 5.a) database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) @@ -552,7 +543,7 @@ GEM jwt (>= 2.5) ostruct (>= 0.5) dotenv (2.7.6) - drb (2.2.1) + drb (2.2.3) dry-cli (1.0.0) dry-core (1.0.1) concurrent-ruby (~> 1.0) @@ -608,9 +599,9 @@ GEM html-pipeline (~> 2.9) factory_bot (6.5.0) activesupport (>= 5.0.0) - factory_bot_rails (6.4.4) + factory_bot_rails (6.5.0) factory_bot (~> 6.5) - railties (>= 5.0.0) + railties (>= 6.1.0) faraday (2.13.1) faraday-net_http (>= 2.0, < 3.5) json @@ -619,7 +610,7 @@ GEM faraday (>= 1, < 3) faraday-http-cache (2.5.0) faraday (>= 0.8) - faraday-multipart (1.1.0) + faraday-multipart (1.1.1) multipart-post (~> 2.0) faraday-net_http (3.1.0) net-http @@ -734,10 +725,10 @@ GEM terminal-table (>= 1.5.1) gitlab-chronic (0.10.6) numerizer (~> 0.2) - gitlab-cloud-connector (1.17.0) + gitlab-cloud-connector (1.21.0) activesupport (~> 7.0) jwt (~> 2.9.3) - gitlab-crystalball (1.1.0) + gitlab-crystalball (1.1.1) git (< 4) ostruct (< 1) gitlab-dangerfiles (4.9.2) @@ -758,15 +749,17 @@ GEM nokogiri (~> 1, >= 1.10.8) gitlab-glfm-markdown (0.0.31) rb_sys (~> 0.9.109) - gitlab-kas-grpc (17.11.3) + gitlab-kas-grpc (18.1.0) grpc (~> 1.0) - gitlab-labkit (0.37.0) + gitlab-labkit (0.39.0) actionpack (>= 5.0.0, < 8.1.0) activesupport (>= 5.0.0, < 8.1.0) + google-protobuf (~> 3) grpc (>= 1.62) jaeger-client (~> 1.1.0) opentracing (~> 0.4) - pg_query (>= 5.1.0, < 7.0) + pg_query (>= 6.1.0, < 7.0) + prometheus-client-mmap (~> 1.2.9) redis (> 3.0.0, < 6.0.0) gitlab-license (2.6.0) gitlab-mail_room (0.0.27) @@ -782,7 +775,7 @@ GEM activesupport (>= 5.2.0) rake (~> 13.0) snowplow-tracker (~> 0.8.0) - gitlab-secret_detection (0.29.1) + gitlab-secret_detection (0.33.0) grpc (>= 1.63.0, < 2) grpc_reflection (~> 0.1) parallel (~> 1) @@ -790,9 +783,10 @@ GEM sentry-ruby (~> 5.22) stackprof (~> 0.2.27) toml-rb (~> 2.2) - gitlab-security_report_schemas (0.1.2.min15.0.0.max15.2.1) + gitlab-security_report_schemas (0.1.3.min15.0.0.max15.2.2) activesupport (>= 6, < 8) json_schemer (~> 2.3.0) + mutex_m (~> 0.3.0) gitlab-styles (13.1.0) rubocop (= 1.71.1) rubocop-capybara (~> 2.21.0) @@ -887,9 +881,6 @@ GEM google-cloud-location (0.6.0) gapic-common (>= 0.20.0, < 2.a) google-cloud-errors (~> 1.0) - google-cloud-profiler-v2 (0.4.0) - gapic-common (>= 0.18.0, < 2.a) - google-cloud-errors (~> 1.0) google-cloud-storage (1.45.0) addressable (~> 2.8) digest-crc (~> 0.4) @@ -995,7 +986,7 @@ GEM thor tilt hana (1.3.7) - hashdiff (1.1.0) + hashdiff (1.2.0) hashie (5.0.0) health_check (3.1.0) railties (>= 5.0) @@ -1104,7 +1095,7 @@ GEM language_server-protocol (3.17.0.3) launchy (2.5.2) addressable (~> 2.8) - lefthook (1.11.13) + lefthook (1.11.16) letter_opener (1.10.0) launchy (>= 2.2, < 4) letter_opener_web (3.0.0) @@ -1259,7 +1250,7 @@ GEM ostruct (>= 0.2) oj-introspect (0.8.0) oj (>= 3.16.10) - omniauth (2.1.2) + omniauth (2.1.3) hashie (>= 3.4.6) rack (>= 2.2.3) rack-protection @@ -1312,7 +1303,7 @@ GEM opensearch-ruby (3.4.0) faraday (>= 1.0, < 3) multi_json (>= 1.0) - openssl (3.2.0) + openssl (3.3.0) openssl-signature_algorithm (1.3.0) openssl (> 2.0) opentelemetry-api (1.2.5) @@ -1516,7 +1507,7 @@ GEM pyu-ruby-sasl (0.0.3.3) raabro (1.4.0) racc (1.8.1) - rack (2.2.13) + rack (2.2.17) rack-accept (0.4.5) rack (>= 0.4) rack-attack (6.7.0) @@ -1588,7 +1579,7 @@ GEM rake-compiler-dock (= 1.9.1) rbs (3.6.1) logger - rbtrace (0.5.1) + rbtrace (0.5.2) ffi (>= 1.0.6) msgpack (>= 0.4.3) optimist (>= 3.0.0) @@ -1726,9 +1717,6 @@ GEM rubocop-rspec_rails (2.30.0) rubocop (~> 1.61) rubocop-rspec (~> 3, >= 3.0.1) - ruby-fogbugz (0.3.0) - crack (~> 0.4) - multipart-post (~> 2.0) ruby-lsp (0.23.20) language_server-protocol (~> 3.17.0) prism (>= 1.2, < 2.0) @@ -1736,7 +1724,7 @@ GEM sorbet-runtime (>= 0.5.10782) ruby-lsp-rails (0.3.31) ruby-lsp (>= 0.23.0, < 0.24.0) - ruby-lsp-rspec (0.1.23) + ruby-lsp-rspec (0.1.24) ruby-lsp (~> 0.23.19) ruby-magic (0.6.0) mini_portile2 (~> 2.8) @@ -1845,7 +1833,7 @@ GEM tilt (~> 2.0) yard (~> 0.9, >= 0.9.24) yard-solargraph (~> 0.1) - solargraph-rspec (0.5.1) + solargraph-rspec (0.5.2) solargraph (~> 0.52, >= 0.52.0) sorbet-runtime (0.5.11647) spamcheck (1.3.3) @@ -1854,7 +1842,8 @@ GEM spring-commands-rspec (1.0.4) spring (>= 0.9.1) sprite-factory (1.7.1) - sprockets (3.7.2) + sprockets (3.7.5) + base64 concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.5.2) @@ -1961,12 +1950,14 @@ GEM tzinfo (2.0.6) concurrent-ruby (~> 1.0) uber (0.1.0) - undercover (0.6.4) + undercover (0.7.0) base64 bigdecimal imagen (>= 0.2.0) rainbow (>= 2.1, < 4.0) rugged (>= 0.27, < 1.10) + simplecov + simplecov_json_formatter unf (0.1.4) unf_ext unf_ext (0.0.8.2) @@ -2084,7 +2075,7 @@ DEPENDENCIES benchmark-ips (~> 2.14.0) benchmark-memory (~> 0.1) better_errors (~> 2.10.1) - bootsnap (~> 1.18.3) + bootsnap (~> 1.18.6) browser (~> 5.3.1) bullet (~> 8.0.0) bundler-checksum (~> 0.1.0)! @@ -2094,7 +2085,6 @@ DEPENDENCIES charlock_holmes (~> 0.7.9) circuitbox (= 2.0.0) click_house-client! - cloud_profiler_agent (~> 0.0.0)! commonmarker (~> 0.23.10) concurrent-ruby (~> 1.1) connection_pool (~> 2.5.3) @@ -2128,7 +2118,7 @@ DEPENDENCIES email_reply_trimmer (~> 0.1) email_spec (~> 2.3.0) error_tracking_open_api! - factory_bot_rails (~> 6.4.3) + factory_bot_rails (~> 6.5.0) faraday (~> 2) faraday-multipart (~> 1.0) faraday-retry (~> 2) @@ -2154,7 +2144,7 @@ DEPENDENCIES gitlab-active-context! gitlab-backup-cli! gitlab-chronic (~> 0.10.5) - gitlab-cloud-connector (~> 1.14) + gitlab-cloud-connector (~> 1.21) gitlab-crystalball (~> 1.1.0) gitlab-dangerfiles (~> 4.9.0) gitlab-duo-workflow-service-client (~> 0.2)! @@ -2163,8 +2153,8 @@ DEPENDENCIES gitlab-glfm-markdown (~> 0.0.31) gitlab-housekeeper! gitlab-http! - gitlab-kas-grpc (~> 17.11.0) - gitlab-labkit (~> 0.37.0) + gitlab-kas-grpc (~> 18.1.0) + gitlab-labkit (~> 0.39.0) gitlab-license (~> 2.6) gitlab-mail_room (~> 0.0.24) gitlab-markup (~> 2.0.0) @@ -2175,7 +2165,7 @@ DEPENDENCIES gitlab-schema-validation! gitlab-sdk (~> 0.3.0) gitlab-secret_detection (< 1.0) - gitlab-security_report_schemas (= 0.1.2.min15.0.0.max15.2.1) + gitlab-security_report_schemas (= 0.1.3.min15.0.0.max15.2.2) gitlab-sidekiq-fetcher! gitlab-styles (~> 13.1.0) gitlab-topology-service-client (~> 0.1)! @@ -2215,6 +2205,7 @@ DEPENDENCIES guard-rspec haml_lint (~> 0.58) hamlit (~> 2.15.0) + hashdiff (~> 1.2.0) hashie (~> 5.0.0) health_check (~> 3.0) html-pipeline (~> 2.14.3) @@ -2354,7 +2345,6 @@ DEPENDENCIES rspec_junit_formatter rspec_profiling (~> 0.0.9) rubocop - ruby-fogbugz (~> 0.3.0) ruby-lsp (~> 0.23.0) ruby-lsp-rails (~> 0.3.6) ruby-lsp-rspec (~> 0.1.10) @@ -2405,7 +2395,7 @@ DEPENDENCIES truncato (~> 0.7.13) tty-prompt (~> 0.23) typhoeus (~> 1.4.0) - undercover (~> 0.6.0) + undercover (~> 0.7.0) unicode-emoji (~> 4.0) unleash (~> 3.2.2) uri (= 0.13.2) diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix index 4edeca120f33..9042ca7c22c3 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 = "0hbn563v0rc85md0fcx3z968dvq7n2ra64wbgyxg09ndjgwl9870"; + sha256 = "1xvnj58nln2xa8vlxc1v4zgyda4n387npbcd94z3pjg28fvk8xc1"; type = "gem"; }; - version = "2.0.21"; + version = "2.0.22"; }; actioncable = { dependencies = [ @@ -557,10 +557,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1bkkx0sz1lkqhzkrpklnalpv2dshvrdi12yq47xmv0nflhgzysmp"; + sha256 = "08d3khg5bpi73vmghphr5w4acds2vr8gcdpm93fsaj38wvb960s9"; type = "gem"; }; - version = "1.131.0"; + version = "1.133.0"; }; aws-sdk-core = { dependencies = [ @@ -925,7 +925,7 @@ src: { groups = [ "default" ]; platforms = [ ]; source = { - path = "${src}/vendor/gems/bundler-checksum"; + path = "${src}/gems/bundler-checksum"; type = "path"; }; version = "0.1.0"; @@ -1145,21 +1145,6 @@ src: { }; version = "0.1.0"; }; - cloud_profiler_agent = { - dependencies = [ - "google-cloud-profiler-v2" - "google-protobuf" - "googleauth" - "stackprof" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - path = "${src}/vendor/gems/cloud_profiler_agent"; - type = "path"; - }; - version = "0.0.1.pre"; - }; coderay = { groups = [ "default" @@ -1232,10 +1217,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; + sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1"; type = "gem"; }; - version = "1.2.3"; + version = "1.3.5"; }; connection_pool = { groups = [ @@ -1478,10 +1463,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1iz1hv2b1z7509dxvxdwzay1hhs24glxls5ldbyh688zxkcdca1j"; + sha256 = "1jxzgg3yccp3gjncl5ih0y13dcappmy0y8pq85wgjj0yx5fh0ixy"; type = "gem"; }; - version = "2.2.0"; + version = "2.2.1"; }; database_cleaner-core = { groups = [ @@ -1809,15 +1794,17 @@ src: { drb = { groups = [ "default" + "development" + "monorepo" "test" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79"; + sha256 = "0wrkl7yiix268s2md1h6wh91311w95ikd8fy8m5gx589npyxc00b"; type = "gem"; }; - version = "2.2.1"; + version = "2.2.3"; }; dry-cli = { groups = [ "default" ]; @@ -2192,10 +2179,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "122wkrc3d2q1dlca27794hh3arw0kvrf3rgmvn7hj3y5lb51g7hk"; + sha256 = "18n06y5ww7d08w296b6fpzx05yywp5r8p88j0k37r994aiin2ysa"; type = "gem"; }; - version = "6.4.4"; + version = "6.5.0"; }; faraday = { dependencies = [ @@ -2250,10 +2237,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0l87r9jg06nsh24gwwd1jdnxb1zq89ffybnxab0dd90nfcf0ysw5"; + sha256 = "00w9imp55hi81q0wsgwak90ldkk7gbyb8nzmmv8hy0s907s8z8bp"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.1"; }; faraday-net_http = { dependencies = [ "net-http" ]; @@ -2857,10 +2844,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0d5zrz5vgb8zrnri42awqfvcq9kfzlrc032nprknddpb9iagbsmr"; + sha256 = "02bpl0jz8m7kfa5alkc90cbajkxy5fggva10zh7cgii3y912msqn"; type = "gem"; }; - version = "1.17.0"; + version = "1.21.0"; }; gitlab-crystalball = { dependencies = [ @@ -2874,10 +2861,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1a42qg2m7w0qn7as3zrc4v7lrxig532izi7yb2w8rbcwm114fcdx"; + sha256 = "1vdqa11dchcmlkph9almmxjq9qsgcfv0n460lyghx7l0n09s2r04"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.1"; }; gitlab-dangerfiles = { dependencies = [ @@ -2994,29 +2981,31 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0lsz61cr7i3d72i6rxvbfqbq6f5anzbbmhmrmr7mprna4dy93d7q"; + sha256 = "07d5jav33nvl83s83yd9fg6vv636n65ybni6m6k3yvlfxygpb3wn"; type = "gem"; }; - version = "17.11.3"; + version = "18.1.0"; }; gitlab-labkit = { dependencies = [ "actionpack" "activesupport" + "google-protobuf" "grpc" "jaeger-client" "opentracing" "pg_query" + "prometheus-client-mmap" "redis" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0w7szxnvh9hvxcragnqvn37c6jpm4gf7aadzxslajj91vdh0mpfj"; + sha256 = "07jpj78nnjmgz9brxxzqbx7l9fajyfq74l4vjavqmnff18vgr0gf"; type = "gem"; }; - version = "0.37.0"; + version = "0.39.0"; }; gitlab-license = { groups = [ "default" ]; @@ -3156,24 +3145,25 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0b4908vic675qq1mh1i45vh5z9vdg1ynanxdbdzaazxvjkakdwzd"; + sha256 = "14ds4l7802ypxx56pid7xlhnlbk5ir9zc8adfm96yy9k2sgfmdnf"; type = "gem"; }; - version = "0.29.1"; + version = "0.33.0"; }; gitlab-security_report_schemas = { dependencies = [ "activesupport" "json_schemer" + "mutex_m" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1bl0qrmb6xci719zxnaizja2pf0wabzi91b49y0immf9gr43f01h"; + sha256 = "0v4sfh2497g5w5hhf89wjgvjbasa13hfgm0r05myzd5hbv7v2h3f"; type = "gem"; }; - version = "0.1.2.min15.0.0.max15.2.1"; + version = "0.1.3.min15.0.0.max15.2.2"; }; gitlab-sidekiq-fetcher = { dependencies = [ @@ -3589,20 +3579,6 @@ src: { }; version = "0.6.0"; }; - google-cloud-profiler-v2 = { - dependencies = [ - "gapic-common" - "google-cloud-errors" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1qyknlvwji7vqhani490cacsrzlqfza10hv47him93yhfnqjmz2k"; - type = "gem"; - }; - version = "0.4.0"; - }; google-cloud-storage = { dependencies = [ "addressable" @@ -4050,10 +4026,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1jf9dxgjz6z7fvymyz2acyvn9iyvwkn6d9sk7y4fxwbmfc75yimm"; + sha256 = "1da0w5v7ppxrgvh58bafjklzv73nknyq73if6d9rkz2v24zg3169"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; }; hashie = { groups = [ "default" ]; @@ -4697,10 +4673,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "18msiw0b3krm9krxrahiladblh6pjpj395wcjjw2fvsimwyy7vk4"; + sha256 = "11g6iqlsck4ypjfg1b7pkcisy5qbm774rwbwdz2rka5lcccky9qs"; type = "gem"; }; - version = "1.11.13"; + version = "1.11.16"; }; letter_opener = { dependencies = [ "launchy" ]; @@ -5672,10 +5648,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1km0wqx9pj609jidvrqfsvzbzfgdnlpdnv7i7xfqm3wb55vk5w6y"; + sha256 = "1hjnb5b5m549irs0h1455ipzsv82pikdagx9wjb6r4j1bkjy494d"; type = "gem"; }; - version = "2.1.2"; + version = "2.1.3"; }; omniauth-alicloud = { dependencies = [ "omniauth-oauth2" ]; @@ -5920,10 +5896,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "054d6ybgjdzxw567m7rbnd46yp6gkdbc5ihr536vxd3p15vbhjrw"; + sha256 = "0ygfbbs3c61d32ymja2k6sznj5pr540cip9z91lhzcvsr4zmffpz"; type = "gem"; }; - version = "3.2.0"; + version = "3.3.0"; }; openssl-signature_algorithm = { dependencies = [ "openssl" ]; @@ -6960,10 +6936,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1yzhcwvfkrlb8l79w24yjclv636jn6rnznp95shmssk934bi1vnc"; + sha256 = "1pcr8sn02lwzv3z6vx5n41b6ybcnw9g9h05s3lkv4vqdm0f2mq2z"; type = "gem"; }; - version = "2.2.13"; + version = "2.2.17"; }; rack-accept = { dependencies = [ "rack" ]; @@ -7314,10 +7290,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1p65p6f917al0f07sn5ca9yj92f7mk52xgnp0ahqpyrb8r6sdjz8"; + sha256 = "158qydqnrn1r0gm806j0bn439y0dyzdpscwi1sm3ldl1mcid5mx2"; type = "gem"; }; - version = "0.5.1"; + version = "0.5.2"; }; rchardet = { groups = [ @@ -8063,20 +8039,6 @@ src: { }; version = "2.30.0"; }; - ruby-fogbugz = { - dependencies = [ - "crack" - "multipart-post" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0mznsnhsgh1yg57j5gighr9vjricnix1l7ngf654k3v4fkjcs12y"; - type = "gem"; - }; - version = "0.3.0"; - }; ruby-lsp = { dependencies = [ "language_server-protocol" @@ -8110,10 +8072,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1lv886262vzmjpgcd0759zn86yaidjn1wznnscn75saj4d81bafj"; + sha256 = "08m2fw4f784lkbyz5rbzdhj57p0x2pfygk66ls0qsn5avnv7izs1"; type = "gem"; }; - version = "0.1.23"; + version = "0.1.24"; }; ruby-magic = { dependencies = [ "mini_portile2" ]; @@ -8704,10 +8666,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1kpsdfkj6yvd5ndhj5vbll4591lwg4gjrf5c61ffj8vvy4j93z0d"; + sha256 = "1wxzz7580h6k2sghj9p1ss33i6nlmpmwqawi6ilr87si233rwgxc"; type = "gem"; }; - version = "0.5.1"; + version = "0.5.2"; }; sorbet-runtime = { groups = [ @@ -8772,21 +8734,18 @@ src: { }; sprockets = { dependencies = [ + "base64" "concurrent-ruby" "rack" ]; - groups = [ - "default" - "development" - "test" - ]; + groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay"; + sha256 = "10ykzsa76cf8kvbfkszlvbyn4ckcx1mxjhfvwxzs7y28cljhzhkj"; type = "gem"; }; - version = "3.7.2"; + version = "3.7.5"; }; sprockets-rails = { dependencies = [ @@ -9475,6 +9434,8 @@ src: { "imagen" "rainbow" "rugged" + "simplecov" + "simplecov_json_formatter" ]; groups = [ "coverage" @@ -9484,10 +9445,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "06pc56qly4c8ygwg9hyay1vmxq75clm62ljw0s9ljamm57qzqd1w"; + sha256 = "0kd7rk9qf9gx53i8jrkc1fjl2bjjxyw9cd1i784ipnfl3dc0da8s"; type = "gem"; }; - version = "0.6.4"; + version = "0.7.0"; }; unf = { dependencies = [ "unf_ext" ];