From dd65d0c67edff6b26e00084f6dbc909a60c266bc Mon Sep 17 00:00:00 2001 From: Yaya Date: Wed, 17 Jan 2024 14:31:00 +0100 Subject: gitlab: 16.7.4 -> 16.8.1 https://gitlab.com/gitlab-org/gitlab/-/blob/v16.8.1-ee/CHANGELOG.md Co-Authored-By: ajs124 --- .../version-management/gitlab/data.json | 18 +- .../version-management/gitlab/default.nix | 48 ++++- .../version-management/gitlab/gitaly/default.nix | 6 +- .../gitlab-elasticsearch-indexer/default.nix | 6 +- .../gitlab/gitlab-pages/default.nix | 6 +- .../gitlab/gitlab-shell/default.nix | 6 +- .../gitlab/gitlab-workhorse/default.nix | 4 +- .../version-management/gitlab/rubyEnv/Gemfile | 51 +++--- .../version-management/gitlab/rubyEnv/Gemfile.lock | 178 +++++++++--------- .../version-management/gitlab/rubyEnv/gemset.nix | 203 ++++++++++++--------- 10 files changed, 297 insertions(+), 229 deletions(-) (limited to 'pkgs/applications/version-management') diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 7e84cf7c7c17..dddcdf5812d4 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "16.7.4", - "repo_hash": "sha256-rUEr9G/5T4yWnNY69I+IpjsVOSmfdL0j0u6et4jkIt8=", - "yarn_hash": "1qxz2p969qg7kzyvhwxws5zwdw986gdq9gxllzi58c5c56jz49zf", + "version": "16.8.1", + "repo_hash": "sha256-95YdEAUYoFDFX4COI6NnI6tDB+NLnihlJdUDM8NixXA=", + "yarn_hash": "1yhl4l2dln9ck4nbjjrlyjx17nxk4h12gb5hqjh4dq3rz3az3jvx", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v16.7.4-ee", + "rev": "v16.8.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "16.7.4", - "GITLAB_PAGES_VERSION": "16.7.4", - "GITLAB_SHELL_VERSION": "14.32.0", - "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.5.0", - "GITLAB_WORKHORSE_VERSION": "16.7.4" + "GITALY_SERVER_VERSION": "16.8.1", + "GITLAB_PAGES_VERSION": "16.8.1", + "GITLAB_SHELL_VERSION": "14.33.0", + "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.6.0", + "GITLAB_WORKHORSE_VERSION": "16.8.1" } } diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index dbc86c730eea..b201b6f62ea0 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -1,7 +1,9 @@ { stdenv, lib, fetchurl, fetchpatch, fetchFromGitLab, bundlerEnv , ruby_3_1, tzdata, git, nettools, nixosTests, nodejs, openssl +, defaultGemConfig, buildRubyGem , gitlabEnterprise ? false, callPackage, yarn , prefetch-yarn-deps, replace, file, cacert, fetchYarnDeps, makeWrapper, pkg-config +, cargo, rustc, rustPlatform }: let @@ -19,20 +21,54 @@ let name = "gitlab-env-${version}"; ruby = ruby_3_1; gemdir = ./rubyEnv; - gemset = - let x = import (gemdir + "/gemset.nix") src; - in x // { - gpgme = x.gpgme // { + gemset = import (gemdir + "/gemset.nix") src; + gemConfig = defaultGemConfig // { + gpgme = attrs: { nativeBuildInputs = [ pkg-config ]; }; # the openssl needs the openssl include files - openssl = x.openssl // { + openssl = attrs: { buildInputs = [ openssl ]; }; - ruby-magic = x.ruby-magic // { + ruby-magic = attrs: { buildInputs = [ file ]; buildFlags = [ "--enable-system-libraries" ]; }; + gitlab-glfm-markdown = attrs: { + cargoDeps = rustPlatform.fetchCargoTarball { + src = stdenv.mkDerivation { + inherit (buildRubyGem { inherit (attrs) gemName version source; }) + name + src + unpackPhase + nativeBuildInputs + ; + dontBuilt = true; + installPhase = '' + cp -R ext/glfm_markdown $out + cp Cargo.lock $out + ''; + }; + hash = "sha256-I5w/roDgnRe5eyXo0wiRcoWPpXEtpL3kOl9eDg99t/w="; + }; + + dontBuild = false; + + nativeBuildInputs = [ + cargo + rustc + rustPlatform.cargoSetupHook + rustPlatform.bindgenHook + ]; + + preInstall = '' + export CARGO_HOME="$PWD/../.cargo/" + ''; + + postInstall = '' + mv -v $GEM_HOME/gems/${attrs.gemName}-${attrs.version}/lib/{glfm_markdown/glfm_markdown.so,} + ''; + }; }; groups = [ "default" "unicorn" "ed25519" "metrics" "development" "puma" "test" "kerberos" diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 754f8027100f..e6d9ce605b4c 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -6,7 +6,7 @@ }: let - version = "16.7.4"; + version = "16.8.1"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -18,10 +18,10 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-4wdMwLsJiQzaZ8PhQz7gYj+dzA+92NFPm0twMdr65qA="; + hash = "sha256-yR8O9F6THymKKHbnfh67NhEcNNBz7XHja/fpeTmVoe0="; }; - vendorHash = "sha256-btWHZMy1aBSsUVs30IqrdBCO79XQvTMXxkxYURF2Nqs="; + vendorHash = "sha256-AkL/BbCrqgXyvfiMxzMIXeZwh5aFL2a2+myk/4YXMNc="; ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix b/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix index d6a35bc96cad..da6dbda266c6 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gitlab-elasticsearch-indexer"; - version = "4.5.0"; + version = "4.6.0"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-elasticsearch-indexer"; rev = "v${version}"; - sha256 = "sha256-6Y2ARnFjbz6nFhWGRhzgAY8s0aX24oLMY1016oRD9oo="; + sha256 = "sha256-HlT3Uj/DWbyK4xGq7SjKjZ90sww6oMiMDo05mtv6rTA="; }; - vendorHash = "sha256-jpjfQl2z5yPnlGEYW6KKBfd4quchT+bU/RU6vwaB4gQ="; + vendorHash = "sha256-YUH/agSy/shHmHRXlfDtgumbka6BjX5NTxgvlNJS4hQ="; buildInputs = [ icu ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 0e21984866f2..202dd29c4fab 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "16.7.4"; + version = "16.8.1"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-6OPpfn+nylTUp7rNI8NqipbHmLmaV0ezE1qrQqHcuqw="; + hash = "sha256-Wj15GHm+5Xd5wq4C3dH+i94jh7pecHM6KCDugLm5YAA="; }; - vendorHash = "sha256-NMky8v0YmN2pSeKJ7G0+DWAZvUx2JlwFbqPHvciYroM="; + vendorHash = "sha256-9yogTSdEij/YwWGm3gz7jMn2AZcI+o7aEnjBvJ8E3vA="; subPackages = [ "." ]; meta = with lib; { diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 568ba88deeca..ab79f9fac00a 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,21 +2,21 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "14.32.0"; + version = "14.33.0"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-fZttdcIdPeiy2ncDyseR1BnR6GBoSRsFkn7Mxc+mTA8="; + sha256 = "sha256-0C3ODs2NElJQ+A6x9lZxSParTZc3q4YqWsw7DxwhODo="; }; buildInputs = [ ruby libkrb5 ]; patches = [ ./remove-hardcoded-locations.patch ]; - vendorHash = "sha256-tdYBEV/dKnIJ+OWTF3/5bIbWVdE/ulMrMD/LMzj1QZE="; + vendorHash = "sha256-sTAd/AbPx5WzBCzTDLvo/bDZcmz/xVhIhz9nFGBEYx4="; postInstall = '' cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index c05ced41045d..58361fbfb631 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "16.7.4"; + version = "16.8.1"; # nixpkgs-update: no auto update src = fetchFromGitLab { @@ -17,7 +17,7 @@ buildGoModule rec { sourceRoot = "${src.name}/workhorse"; - vendorHash = "sha256-1oeToeqGXSj5CdL5dgWsnN/VpwALlus93P0Ed7G8TIw="; + vendorHash = "sha256-OcdfanSlH1ZUmKlhzMOD3oNySx1o92Is7EDf1Z3953A="; buildInputs = [ git ]; ldflags = [ "-X main.Version=${version}" ]; doCheck = false; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 0ddaf9afb3a3..161dc46f7844 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -28,7 +28,7 @@ gem 'rails', '~> 7.0.8' # rubocop:todo Gemfile/MissingFeatureCategory gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'bootsnap', '~> 1.17.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory +gem 'bootsnap', '~> 1.17.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory gem 'openssl', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'ipaddr', '~> 1.2.5' # rubocop:todo Gemfile/MissingFeatureCategory @@ -133,11 +133,11 @@ gem 'gitlab_omniauth-ldap', '~> 2.2.0', require: 'omniauth-ldap' # rubocop:todo gem 'net-ldap', '~> 0.17.1' # rubocop:todo Gemfile/MissingFeatureCategory # API -gem 'grape', '~> 1.7.1', feature_category: :api +gem 'grape', '~> 2.0.0', feature_category: :api gem 'grape-entity', '~> 0.10.0', feature_category: :api -gem 'grape-swagger', '~> 1.6.1', group: [:development, :test], feature_category: :api +gem 'grape-swagger', '~> 2.0.1', group: [:development, :test], feature_category: :api gem 'grape-swagger-entity', '~> 0.5.1', group: [:development, :test], feature_category: :api -gem 'grape-path-helpers', '~> 1.7.1', feature_category: :api +gem 'grape-path-helpers', '~> 2.0.0', feature_category: :api gem 'rack-cors', '~> 2.0.1', require: 'rack/cors' # rubocop:todo Gemfile/MissingFeatureCategory # GraphQL API @@ -203,17 +203,17 @@ gem 'seed-fu', '~> 2.3.7' # rubocop:todo Gemfile/MissingFeatureCategory gem 'elasticsearch-model', '~> 7.2' # rubocop:todo Gemfile/MissingFeatureCategory gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' # rubocop:todo Gemfile/MissingFeatureCategory gem 'elasticsearch-api', '7.13.3' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'aws-sdk-core', '~> 3.190.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'aws-sdk-core', '~> 3.190.2' # rubocop:todo Gemfile/MissingFeatureCategory gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'aws-sdk-s3', '~> 1.141.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'aws-sdk-s3', '~> 1.142.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'faraday_middleware-aws-sigv4', '~>0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections # rubocop:todo Gemfile/MissingFeatureCategory # Markdown and HTML processing -gem 'html-pipeline', '~> 2.14.3' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'deckar01-task_list', '2.3.3' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'html-pipeline', '~> 2.14.3', feature_category: :team_planning +gem 'deckar01-task_list', '2.3.3', feature_category: :team_planning gem 'gitlab-markup', '~> 1.9.0', require: 'github/markup' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'commonmarker', '~> 0.23.10' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'commonmarker', '~> 0.23.10', feature_category: :team_planning gem 'kramdown', '~> 2.3.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'RedCloth', '~> 4.3.3' # rubocop:todo Gemfile/MissingFeatureCategory gem 'org-ruby', '~> 0.9.12' # rubocop:todo Gemfile/MissingFeatureCategory @@ -225,7 +225,8 @@ gem 'asciidoctor-plantuml', '~> 0.0.16' # rubocop:todo Gemfile/MissingFeatureCat gem 'asciidoctor-kroki', '~> 0.8.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory gem 'rouge', '~> 4.2.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'truncato', '~> 0.7.12' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'nokogiri', '~> 1.15', '>= 1.15.5' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'nokogiri', '~> 1.16' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'gitlab-glfm-markdown', '~> 0.0.11', feature_category: :team_planning # Calendar rendering gem 'icalendar' # rubocop:todo Gemfile/MissingFeatureCategory @@ -240,7 +241,7 @@ gem 'rack', '~> 2.2.8' # rubocop:todo Gemfile/MissingFeatureCategory gem 'rack-timeout', '~> 0.6.3', require: 'rack/timeout/base' # rubocop:todo Gemfile/MissingFeatureCategory group :puma do - gem 'puma', '~> 6.4', require: false # rubocop:todo Gemfile/MissingFeatureCategory + gem 'puma', '= 6.4.0', require: false, feature_category: :shared gem 'sd_notify', '~> 0.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory end @@ -251,7 +252,7 @@ gem 'state_machines-activerecord', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeat gem 'acts-as-taggable-on', '~> 10.0' # rubocop:todo Gemfile/MissingFeatureCategory # Background jobs -gem 'sidekiq', '~> 6.5.10' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'sidekiq', '~> 7.1.6' # rubocop:todo Gemfile/MissingFeatureCategory gem 'sidekiq-cron', '~> 1.12.0', feature_category: :shared gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', require: 'sidekiq-reliable-fetch' # rubocop:todo Gemfile/MissingFeatureCategory @@ -268,7 +269,7 @@ gem 'rainbow', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'ruby-progressbar', '~> 1.10' # rubocop:todo Gemfile/MissingFeatureCategory # Linear-time regex library for untrusted regular expressions -gem 're2', '2.5.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 're2', '2.6.0' # rubocop:todo Gemfile/MissingFeatureCategory # Misc @@ -288,7 +289,7 @@ gem 'redis-namespace', '~> 1.10.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'connection_pool', '~> 2.4' # rubocop:todo Gemfile/MissingFeatureCategory # Redis session store -gem 'redis-actionpack', '~> 5.3.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'redis-actionpack', '~> 5.4.0' # rubocop:todo Gemfile/MissingFeatureCategory # Discord integration gem 'discordrb-webhooks', '~> 3.4', require: false, feature_category: :integrations @@ -366,7 +367,7 @@ gem 'gitlab-http', path: 'gems/gitlab-http' # rubocop:todo Gemfile/MissingFeatur gem 'premailer-rails', '~> 1.10.3' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'gitlab-labkit', '~> 0.34.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'gitlab-labkit', '~> 0.35.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'thrift', '>= 0.16.0' # rubocop:todo Gemfile/MissingFeatureCategory # I18n @@ -387,7 +388,7 @@ gem 'snowplow-tracker', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeatureCategory # Metrics gem 'webrick', '~> 1.8.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory -gem 'prometheus-client-mmap', '~> 1.0', '>= 1.0.2', require: 'prometheus/client' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'prometheus-client-mmap', '~> 1.1', require: 'prometheus/client' # rubocop:todo Gemfile/MissingFeatureCategory gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory @@ -406,7 +407,7 @@ group :development do gem 'listen', '~> 3.7' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'ruby-lsp', "~> 0.13.1", require: false, feature_category: :tooling + gem 'ruby-lsp', "~> 0.13.2", require: false, feature_category: :tooling gem 'ruby-lsp-rails', "~> 0.2.8", feature_category: :tooling @@ -416,7 +417,7 @@ end group :development, :test do gem 'deprecation_toolkit', '~> 1.5.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory gem 'bullet', '~> 7.1.2' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'parser', '~> 3.2', '>= 3.2.2.4' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'parser', '~> 3.3', '>= 3.3.0.2' # rubocop:todo Gemfile/MissingFeatureCategory gem 'pry-byebug' # rubocop:todo Gemfile/MissingFeatureCategory gem 'pry-rails', '~> 0.3.9' # rubocop:todo Gemfile/MissingFeatureCategory gem 'pry-shell', '~> 0.6.4' # rubocop:todo Gemfile/MissingFeatureCategory @@ -424,7 +425,7 @@ group :development, :test do gem 'awesome_print', require: false # rubocop:todo Gemfile/MissingFeatureCategory gem 'database_cleaner-active_record', '~> 2.1.0', feature_category: :database - gem 'factory_bot_rails', '~> 6.2.0' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'factory_bot_rails', '~> 6.4.3' # rubocop:todo Gemfile/MissingFeatureCategory gem 'rspec-rails', '~> 6.1.0', feature_category: :shared # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) @@ -435,7 +436,7 @@ group :development, :test do gem 'gitlab-styles', '~> 11.0.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory - gem 'haml_lint', '~> 0.52', require: false # rubocop:todo Gemfile/MissingFeatureCategory + gem 'haml_lint', '~> 0.53', require: false # rubocop:todo Gemfile/MissingFeatureCategory gem 'bundler-audit', '~> 0.9.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory # Benchmarking & profiling @@ -457,7 +458,7 @@ group :development, :test do gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'pact', '~> 1.63' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'pact', '~> 1.64' # rubocop:todo Gemfile/MissingFeatureCategory # For now we only use vite in development / test, and not for production builds # See: https://gitlab.com/gitlab-org/frontend/rfcs/-/issues/106 @@ -472,7 +473,7 @@ group :development, :test, :danger do end group :development, :test, :coverage do - gem 'simplecov', '~> 0.21', require: false, feature_category: :tooling + gem 'simplecov', '~> 0.22', require: false, feature_category: :tooling gem 'simplecov-lcov', '~> 0.8.0', require: false, feature_category: :tooling gem 'simplecov-cobertura', '~> 2.1.0', require: false, feature_category: :tooling gem 'undercover', '~> 0.4.4', require: false, feature_category: :tooling @@ -511,12 +512,12 @@ group :test do gem 'test-prof', '~> 1.3.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'rspec_junit_formatter' # rubocop:todo Gemfile/MissingFeatureCategory gem 'guard-rspec' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'axe-core-rspec' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'axe-core-rspec', '~> 4.8.0', feature_category: :tooling # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 gem 'derailed_benchmarks', require: false # rubocop:todo Gemfile/MissingFeatureCategory - gem 'gitlab_quality-test_tooling', '~> 1.9.0', require: false, feature_category: :tooling + gem 'gitlab_quality-test_tooling', '~> 1.11.0', require: false, feature_category: :tooling end gem 'octokit', '~> 6.0' # rubocop:todo Gemfile/MissingFeatureCategory @@ -558,7 +559,7 @@ gem 'kas-grpc', '~> 0.3.0', feature_category: :deployment_management gem 'grpc', '~> 1.58.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'google-protobuf', '~> 3.25', '>= 3.25.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'google-protobuf', '~> 3.25', '>= 3.25.2' # rubocop:todo Gemfile/MissingFeatureCategory gem 'toml-rb', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index e106367ae951..adbd0b47167f 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -33,6 +33,7 @@ PATH remote: gems/gitlab-housekeeper specs: gitlab-housekeeper (0.1.0) + activesupport httparty rubocop @@ -44,7 +45,6 @@ PATH concurrent-ruby (~> 1.2) httparty (~> 0.21.0) ipaddress (~> 0.8.3) - nokogiri (~> 1.15.4) railties (~> 7) PATH @@ -66,6 +66,7 @@ PATH remote: gems/gitlab-safe_request_store specs: gitlab-safe_request_store (0.1.0) + rack (~> 2.2.8) request_store PATH @@ -79,6 +80,7 @@ PATH remote: gems/gitlab-secret_detection specs: gitlab-secret_detection (0.1.0) + parallel (~> 1.22) re2 (~> 2.4) toml-rb (~> 2.2) @@ -89,7 +91,6 @@ PATH actionview (>= 6.1.7.2) activesupport (>= 6.1.7.2) addressable (~> 2.8) - nokogiri (~> 1.15.2) rake (~> 13.0) PATH @@ -179,9 +180,9 @@ PATH PATH remote: vendor/gems/sidekiq-reliable-fetch specs: - gitlab-sidekiq-fetcher (0.10.0) + gitlab-sidekiq-fetcher (0.11.0) json (>= 2.5) - sidekiq (~> 6.1) + sidekiq (~> 7.0) GEM remote: https://rubygems.org/ @@ -296,28 +297,28 @@ GEM awesome_print (1.9.2) awrence (1.2.1) aws-eventstream (1.3.0) - aws-partitions (1.761.0) + aws-partitions (1.877.0) aws-sdk-cloudformation (1.41.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.190.0) + aws-sdk-core (3.190.2) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.64.0) - aws-sdk-core (~> 3, >= 3.165.0) + aws-sdk-kms (1.76.0) + aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.141.0) + aws-sdk-s3 (1.142.0) aws-sdk-core (~> 3, >= 3.189.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.8) aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) - axe-core-api (4.6.0) + axe-core-api (4.8.0) dumb_delegator virtus - axe-core-rspec (4.6.0) + axe-core-rspec (4.8.0) axe-core-api dumb_delegator virtus @@ -352,7 +353,7 @@ GEM bindata (2.4.11) binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) - bootsnap (1.17.0) + bootsnap (1.17.1) msgpack (~> 1.2) browser (5.3.1) builder (3.2.4) @@ -500,7 +501,7 @@ GEM jwt (>= 2.5) dotenv (2.7.6) dry-cli (1.0.0) - dry-core (1.0.0) + dry-core (1.0.1) concurrent-ruby (~> 1.0) zeitwerk (~> 2.6) dry-inflector (1.0.0) @@ -552,10 +553,10 @@ GEM expression_parser (0.9.0) extended-markdown-filter (0.7.0) html-pipeline (~> 2.9) - factory_bot (6.2.0) + factory_bot (6.4.5) activesupport (>= 5.0.0) - factory_bot_rails (6.2.0) - factory_bot (~> 6.2.0) + factory_bot_rails (6.4.3) + factory_bot (~> 6.4) railties (>= 5.0.0) faraday (1.10.0) faraday-em_http (~> 1.0) @@ -596,7 +597,6 @@ GEM rake ffi-yajl (2.6.0) libyajl2 (>= 1.2) - filelock (1.1.1) find_a_port (1.0.1) flipper (0.26.2) concurrent-ruby (< 2) @@ -693,13 +693,15 @@ GEM fog-core (= 2.1.0) fog-json (~> 1.2.0) mime-types - gitlab-labkit (0.34.0) + gitlab-glfm-markdown (0.0.11) + rb_sys (~> 0.9.86) + gitlab-labkit (0.35.0) actionpack (>= 5.0.0, < 8.0.0) activesupport (>= 5.0.0, < 8.0.0) grpc (>= 1.37) jaeger-client (~> 1.1.0) opentracing (~> 0.4) - pg_query (~> 4.2.3) + pg_query (>= 4.2.3, < 6.0) redis (> 3.0.0, < 6.0.0) gitlab-license (2.3.0) gitlab-mail_room (0.0.24) @@ -727,7 +729,7 @@ GEM omniauth (>= 1.3, < 3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) rubyntlm (~> 0.5) - gitlab_quality-test_tooling (1.9.0) + gitlab_quality-test_tooling (1.11.0) activesupport (>= 6.1, < 7.2) amatch (~> 0.4.1) gitlab (~> 4.19) @@ -798,7 +800,7 @@ GEM google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - google-protobuf (3.25.1) + google-protobuf (3.25.2) googleapis-common-protos (1.4.0) google-protobuf (~> 3.14) googleapis-common-protos-types (~> 1.2) @@ -814,23 +816,24 @@ GEM signet (>= 0.16, < 2.a) gpgme (2.0.23) mini_portile2 (~> 2.7) - grape (1.7.1) - activesupport + grape (2.0.0) + activesupport (>= 5) builder dry-types (>= 1.1) mustermann-grape (~> 1.0.0) - rack (>= 1.3.0, < 3) + rack (>= 1.3.0) rack-accept grape-entity (0.10.0) activesupport (>= 3.0.0) multi_json (>= 1.3.2) - grape-path-helpers (1.7.1) + grape-path-helpers (2.0.1) activesupport - grape (~> 1.3) + grape (~> 2.0) rake (> 12) ruby2_keywords (~> 0.0.2) - grape-swagger (1.6.1) - grape (~> 1.3) + grape-swagger (2.0.1) + grape (>= 1.7, < 3.0) + rack-test (~> 2) grape-swagger-entity (0.5.1) grape-entity (>= 0.6.0) grape-swagger (>= 1.2.0) @@ -879,8 +882,8 @@ GEM haml (5.2.2) temple (>= 0.8.0) tilt - haml_lint (0.52.0) - haml (>= 4.0) + haml_lint (0.53.0) + haml (>= 5.0) parallel (~> 1.10) rainbow rubocop (>= 1.0) @@ -1104,9 +1107,9 @@ GEM net-protocol net-ssh (7.2.0) netrc (0.11.0) - nio4r (2.5.8) + nio4r (2.7.0) no_proxy_fix (0.1.2) - nokogiri (1.15.5) + nokogiri (1.16.0) mini_portile2 (~> 2.8.2) racc (~> 1.4) notiffany (0.1.3) @@ -1206,31 +1209,29 @@ GEM rubypants (~> 0.2) orm_adapter (0.5.0) os (1.1.4) - pact (1.63.0) + pact (1.64.0) pact-mock_service (~> 3.0, >= 3.3.1) pact-support (~> 1.16, >= 1.16.9) rack-test (>= 0.6.3, < 3.0.0) rspec (~> 3.0) - term-ansicolor (~> 1.0) + term-ansicolor (~> 1.7) thor (>= 0.20, < 2.0) - webrick (~> 1.3) - pact-mock_service (3.10.0) - filelock (~> 1.1) + webrick (~> 1.8) + pact-mock_service (3.11.2) find_a_port (~> 1.0.1) json pact-support (~> 1.16, >= 1.16.4) rack (~> 2.0) rspec (>= 2.14) - term-ansicolor (~> 1.0) thor (>= 0.19, < 2.0) - webrick (~> 1.3) - pact-support (1.18.1) + webrick (~> 1.8) + pact-support (1.20.0) awesome_print (~> 1.9) - diff-lcs (~> 1.4) + diff-lcs (~> 1.5) expgen (~> 0.1) rainbow (~> 3.1.1) parallel (1.22.1) - parser (3.2.2.4) + parser (3.3.0.2) ast (~> 2.4.1) racc parslet (1.8.2) @@ -1253,13 +1254,13 @@ GEM prime (0.1.2) forwardable singleton - prism (0.18.0) + prism (0.19.0) proc_to_ast (0.1.0) coderay parser unparser - prometheus-client-mmap (1.0.2) - rb_sys (~> 0.9) + prometheus-client-mmap (1.1.0) + rb_sys (~> 0.9.86) protocol (2.0.0) ruby_parser (~> 3.0) pry (0.14.2) @@ -1297,6 +1298,8 @@ GEM rack rack-proxy (0.7.7) rack + rack-session (1.0.2) + rack (< 3) rack-test (2.1.0) rack (>= 1.3) rack-timeout (0.6.3) @@ -1321,8 +1324,9 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.5.0) - loofah (~> 2.19, >= 2.19.1) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) rails-i18n (7.0.3) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) @@ -1338,31 +1342,33 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rb_sys (0.9.83) + rb_sys (0.9.86) rbtrace (0.4.14) ffi (>= 1.0.6) msgpack (>= 0.4.3) optimist (>= 3.0.0) rbtree (0.4.6) rchardet (1.8.0) - re2 (2.5.0) + re2 (2.6.0) mini_portile2 (~> 2.8.5) recaptcha (5.12.3) json recursive-open-struct (1.1.3) redcarpet (3.6.0) redis (4.8.0) - redis-actionpack (5.3.0) + redis-actionpack (5.4.0) actionpack (>= 5, < 8) - redis-rack (>= 2.1.0, < 3) + redis-rack (>= 2.1.0, < 4) redis-store (>= 1.1.0, < 2) + redis-client (0.19.0) + connection_pool redis-namespace (1.10.0) redis (>= 4) - redis-rack (2.1.4) - rack (>= 2.0.8, < 3) + redis-rack (3.0.0) + rack-session (>= 0.2.0) redis-store (>= 1.2, < 2) - redis-store (1.9.1) - redis (>= 4, < 5) + redis-store (1.10.0) + redis (>= 4, < 6) regexp_parser (2.6.0) regexp_property_values (1.0.0) representable (3.2.0) @@ -1469,9 +1475,9 @@ GEM ruby-fogbugz (0.3.0) crack (~> 0.4) multipart-post (~> 2.0) - ruby-lsp (0.13.1) + ruby-lsp (0.13.2) language_server-protocol (~> 3.17.0) - prism (>= 0.18.0, < 0.19) + prism (>= 0.19.0, < 0.20) sorbet-runtime (>= 0.5.5685) ruby-lsp-rails (0.2.8) actionpack (>= 6.0) @@ -1542,10 +1548,11 @@ GEM shellany (0.0.1) shoulda-matchers (5.1.0) activesupport (>= 5.2.0) - sidekiq (6.5.12) - connection_pool (>= 2.2.5, < 3) - rack (~> 2.0) - redis (>= 4.5.0, < 5) + sidekiq (7.1.6) + concurrent-ruby (< 2) + connection_pool (>= 2.3.0) + rack (>= 2.2.4) + redis-client (>= 0.14.0) sidekiq-cron (1.12.0) fugit (~> 1.8) globalid (>= 1.0.1) @@ -1713,7 +1720,7 @@ GEM unparser (0.6.7) diff-lcs (~> 1.3) parser (>= 3.2.0) - uri (0.12.2) + uri (0.13.0) uri_template (0.7.0) valid_email (0.1.3) activemodel @@ -1808,9 +1815,9 @@ DEPENDENCIES autoprefixer-rails (= 10.2.5.1) awesome_print aws-sdk-cloudformation (~> 1) - aws-sdk-core (~> 3.190.0) - aws-sdk-s3 (~> 1.141.0) - axe-core-rspec + aws-sdk-core (~> 3.190.2) + aws-sdk-s3 (~> 1.142.0) + axe-core-rspec (~> 4.8.0) babosa (~> 2.0) base32 (~> 0.3.0) batch-loader (~> 2.0.1) @@ -1818,7 +1825,7 @@ DEPENDENCIES benchmark-ips (~> 2.11.0) benchmark-memory (~> 0.1) better_errors (~> 2.10.1) - bootsnap (~> 1.17.0) + bootsnap (~> 1.17.1) browser (~> 5.3.1) bullet (~> 7.1.2) bundler-audit (~> 0.9.1) @@ -1861,7 +1868,7 @@ DEPENDENCIES email_reply_trimmer (~> 0.1) email_spec (~> 2.2.0) error_tracking_open_api! - factory_bot_rails (~> 6.2.0) + factory_bot_rails (~> 6.4.3) faraday (~> 1.0) faraday_middleware-aws-sigv4 (~> 0.3.0) fast_blank (~> 1.0.1) @@ -1884,9 +1891,10 @@ DEPENDENCIES gitlab-dangerfiles (~> 4.6.0) gitlab-experiment (~> 0.9.1) gitlab-fog-azure-rm (~> 1.8.0) + gitlab-glfm-markdown (~> 0.0.11) gitlab-housekeeper! gitlab-http! - gitlab-labkit (~> 0.34.0) + gitlab-labkit (~> 0.35.0) gitlab-license (~> 2.3) gitlab-mail_room (~> 0.0.24) gitlab-markup (~> 1.9.0) @@ -1902,7 +1910,7 @@ DEPENDENCIES gitlab-utils! gitlab_chronic_duration (~> 0.12) gitlab_omniauth-ldap (~> 2.2.0) - gitlab_quality-test_tooling (~> 1.9.0) + gitlab_quality-test_tooling (~> 1.11.0) gon (~> 6.4.0) google-apis-androidpublisher_v3 (~> 0.34.0) google-apis-cloudbilling_v1 (~> 0.21.0) @@ -1916,12 +1924,12 @@ DEPENDENCIES google-apis-sqladmin_v1beta4 (~> 0.41.0) google-apis-storage_v1 (~> 0.29) google-cloud-storage (~> 1.45.0) - google-protobuf (~> 3.25, >= 3.25.1) + google-protobuf (~> 3.25, >= 3.25.2) gpgme (~> 2.0.23) - grape (~> 1.7.1) + grape (~> 2.0.0) grape-entity (~> 0.10.0) - grape-path-helpers (~> 1.7.1) - grape-swagger (~> 1.6.1) + grape-path-helpers (~> 2.0.0) + grape-swagger (~> 2.0.1) grape-swagger-entity (~> 0.5.1) grape_logging (~> 1.8) graphiql-rails (~> 1.8.0) @@ -1932,7 +1940,7 @@ DEPENDENCIES grpc (~> 1.58.0) gssapi (~> 1.3.1) guard-rspec - haml_lint (~> 0.52) + haml_lint (~> 0.53) hamlit (~> 2.15.0) hashie (~> 5.0.0) health_check (~> 3.0) @@ -1979,7 +1987,7 @@ DEPENDENCIES net-ldap (~> 0.17.1) net-ntp net-protocol (~> 0.1.3) - nokogiri (~> 1.15, >= 1.15.5) + nokogiri (~> 1.16) oauth2 (~> 2.0) octokit (~> 6.0) ohai (~> 18.1) @@ -2007,20 +2015,20 @@ DEPENDENCIES openssl (~> 3.0) org-ruby (~> 0.9.12) os (~> 1.1) - pact (~> 1.63) + pact (~> 1.64) parallel (~> 1.19) - parser (~> 3.2, >= 3.2.2.4) + parser (~> 3.3, >= 3.3.0.2) parslet (~> 1.8) peek (~> 1.1) pg (~> 1.5.4) pg_query (~> 4.2.3) png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) - prometheus-client-mmap (~> 1.0, >= 1.0.2) + prometheus-client-mmap (~> 1.1) pry-byebug pry-rails (~> 0.3.9) pry-shell (~> 0.6.4) - puma (~> 6.4) + puma (= 6.4.0) rack (~> 2.2.8) rack-attack (~> 6.7.0) rack-cors (~> 2.0.1) @@ -2032,10 +2040,10 @@ DEPENDENCIES rails-i18n (~> 7.0) rainbow (~> 3.0) rbtrace (~> 0.4) - re2 (= 2.5.0) + re2 (= 2.6.0) recaptcha (~> 5.12) redis (~> 4.8.0) - redis-actionpack (~> 5.3.0) + redis-actionpack (~> 5.4.0) redis-namespace (~> 1.10.0) request_store (~> 1.5.1) responders (~> 3.0) @@ -2051,7 +2059,7 @@ DEPENDENCIES rspec_profiling (~> 0.0.6) rubocop ruby-fogbugz (~> 0.3.0) - ruby-lsp (~> 0.13.1) + ruby-lsp (~> 0.13.2) ruby-lsp-rails (~> 0.2.8) ruby-lsp-rspec (~> 0.1.8) ruby-magic (~> 0.6) @@ -2071,11 +2079,11 @@ DEPENDENCIES sentry-ruby (~> 5.10.0) sentry-sidekiq (~> 5.10.0) shoulda-matchers (~> 5.1.0) - sidekiq (~> 6.5.10) + sidekiq (~> 7.1.6) sidekiq-cron (~> 1.12.0) sigdump (~> 0.2.4) simple_po_parser (~> 1.1.6) - simplecov (~> 0.21) + simplecov (~> 0.22) simplecov-cobertura (~> 2.1.0) simplecov-lcov (~> 0.8.0) slack-messenger (~> 2.3.4) @@ -2117,4 +2125,4 @@ DEPENDENCIES yajl-ruby (~> 1.4.3) BUNDLED WITH - 2.4.22 + 2.5.4 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index b419e76f259b..4086a43e089d 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -389,10 +389,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1whf6ppvdibfpsr660ajncig3hyc6q9dvnx645ajrjfz3r7487i9"; + sha256 = "1zcwrlg4in3gzvsiynpzp9fzlr5grrhc2881xcgfs01ppmxysllm"; type = "gem"; }; - version = "1.761.0"; + version = "1.877.0"; }; aws-sdk-cloudformation = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -411,10 +411,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19nglxz49nlzgsvnivb3bdm17vxjn1ng2br8659xv48nzjrmyid3"; + sha256 = "0z9f8ypvpwj3sfqh3nlnhrq7ryhrv7isqzg370fba27zpy7bv5sx"; type = "gem"; }; - version = "3.190.0"; + version = "3.190.2"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -422,10 +422,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bcm0c9f7xy5qj5f0z3gddqslhb2vzrj9smc39pgqyq4jmn5kpj0"; + sha256 = "0jfgw9a9c8xyjhkmgpd9rpi95h9i0rhbqszn8iqkbfm9rc9m1xz7"; type = "gem"; }; - version = "1.64.0"; + version = "1.76.0"; }; aws-sdk-s3 = { dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; @@ -433,10 +433,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bnhpmi0iiaj88rqc5lhhnp2gyrk4fs8xz51lj36wwzng94qinya"; + sha256 = "1sfpipfdmixpc0madfx1yvpwpv52fdhxfx4bmvrjxzb6ra78ikbr"; type = "gem"; }; - version = "1.141.0"; + version = "1.142.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -455,10 +455,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qkcia7yg50j0ycmzqnl2dzzz9a35wlg5fk30g0qs41z6p1xw38v"; + sha256 = "0bx67lskxslfd2mpim3kqrxa4sx4qhvnpjpr57j1ll2xppyl9kw8"; type = "gem"; }; - version = "4.6.0"; + version = "4.8.0"; }; axe-core-rspec = { dependencies = ["axe-core-api" "dumb_delegator" "virtus"]; @@ -466,10 +466,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zvlrnxcyam2574gzn44r0ibz4h0s9j3vrp5lixi731qvp4mphhi"; + sha256 = "07niarqd2lrbgnw00biyigc48lbdv4vy68p57myliz7k82nizidj"; type = "gem"; }; - version = "4.6.0"; + version = "4.8.0"; }; axiom-types = { dependencies = ["descendants_tracker" "ice_nine" "thread_safe"]; @@ -653,10 +653,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0iqkzby0fdgi786m873nm0ckmc847wy9a4ydinb29m7hd3fs83kb"; + sha256 = "028qif22isxa5sg5gf1322d0qjhir5rr0jpkaiwcic4lspacdcnv"; type = "gem"; }; - version = "1.17.0"; + version = "1.17.1"; }; browser = { groups = ["default"]; @@ -1391,10 +1391,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01gks2hrp7nl3pzb487azvd25dlbrc40d5cpk4n0szwnf2c0k4ks"; + sha256 = "03a5qn74c4lk2rpy6wlhv66synjlyzc4wn086xzphkpmw12l4bzk"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; dry-inflector = { groups = ["default" "development" "test"]; @@ -1674,10 +1674,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04vxmjr200akcil9fqxc9ghbb9q0lyrh2q03xxncycd5vln910fi"; + sha256 = "1glq677vmd3xrdilcx6ar8sdaysm9ldrppg34yzw43jzr6dx47fp"; type = "gem"; }; - version = "6.2.0"; + version = "6.4.5"; }; factory_bot_rails = { dependencies = ["factory_bot" "railties"]; @@ -1685,10 +1685,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18fhcihkc074gk62iwqgbdgc3ymim4fm0b4p3ipffy5hcsb9d2r7"; + sha256 = "1j6w4rr2cb5wng9yrn2ya9k40q52m0pbz47kzw8xrwqg3jncwwza"; type = "gem"; }; - version = "6.2.0"; + version = "6.4.3"; }; faraday = { dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"]; @@ -1897,16 +1897,6 @@ src: }; version = "2.6.0"; }; - filelock = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "085vrb6wf243iqqnrrccwhjd4chphfdsybkvjbapa2ipfj1ja1sj"; - type = "gem"; - }; - version = "1.1.1"; - }; find_a_port = { groups = ["default" "development" "test"]; platforms = []; @@ -2220,8 +2210,19 @@ src: }; version = "1.8.0"; }; + gitlab-glfm-markdown = { + dependencies = ["rb_sys"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0z0h4bvfvlwyfx8ia03lr9dlpy38n75v2wxh424v6fhy4z08ycab"; + type = "gem"; + }; + version = "0.0.11"; + }; gitlab-housekeeper = { - dependencies = ["httparty" "rubocop"]; + dependencies = ["activesupport" "httparty" "rubocop"]; groups = ["development" "test"]; platforms = []; source = { @@ -2231,7 +2232,7 @@ src: version = "0.1.0"; }; gitlab-http = { - dependencies = ["activesupport" "concurrent-ruby" "httparty" "ipaddress" "nokogiri" "railties"]; + dependencies = ["activesupport" "concurrent-ruby" "httparty" "ipaddress" "railties"]; groups = ["default"]; platforms = []; source = { @@ -2246,10 +2247,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k9yd8b1xbq3l6l1n4pb0mh2wklz0ninr7h2l5xx031r05150p6a"; + sha256 = "0ya6r3ij0fzz6p50h157bn224n7405nwak6lx80ppvil9sm0dzr6"; type = "gem"; }; - version = "0.34.0"; + version = "0.35.0"; }; gitlab-license = { groups = ["default"]; @@ -2313,7 +2314,7 @@ src: version = "0.1.0"; }; gitlab-safe_request_store = { - dependencies = ["request_store"]; + dependencies = ["rack" "request_store"]; groups = ["default"]; platforms = []; source = { @@ -2344,7 +2345,7 @@ src: version = "0.2.3"; }; gitlab-secret_detection = { - dependencies = ["re2" "toml-rb"]; + dependencies = ["parallel" "re2" "toml-rb"]; groups = ["default"]; platforms = []; source = { @@ -2361,7 +2362,7 @@ src: path = "${src}/vendor/gems/sidekiq-reliable-fetch"; type = "path"; }; - version = "0.10.0"; + version = "0.11.0"; }; gitlab-styles = { dependencies = ["rubocop" "rubocop-graphql" "rubocop-performance" "rubocop-rails" "rubocop-rspec"]; @@ -2375,7 +2376,7 @@ src: version = "11.0.0"; }; gitlab-utils = { - dependencies = ["actionview" "activesupport" "addressable" "nokogiri" "rake"]; + dependencies = ["actionview" "activesupport" "addressable" "rake"]; groups = ["monorepo"]; platforms = []; source = { @@ -2412,10 +2413,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18m35p6kizkaw829lwvh6mc7r8q94gmyhkq9qggx7r78h8iafiqd"; + sha256 = "0anhwfn9dnd8zkjwkq3qycjswfxqksfnwvl7dr6azz2zvjnxnii1"; type = "gem"; }; - version = "1.9.0"; + version = "1.11.0"; }; globalid = { dependencies = ["activesupport"]; @@ -2663,10 +2664,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18yiqq657lbqbrbdfbxfspdrkiynd0wf49l3cgdw939z36cy0h77"; + sha256 = "02sh4rp14wmpfv9r7xrap6xgcakg0lk6zjvq1gsi5y38swhn2blw"; type = "gem"; }; - version = "3.25.1"; + version = "3.25.2"; }; googleapis-common-protos = { dependencies = ["google-protobuf" "googleapis-common-protos-types" "grpc"]; @@ -2718,10 +2719,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dnbb3gxwbmvhzvzb22prwaim9wmvilm0nm91ndw2ggf324rsrvb"; + sha256 = "0jj98w80ry1ir8lc3347130s0z8yd7gk727r9ynwwk782x6gkvrs"; type = "gem"; }; - version = "1.7.1"; + version = "2.0.0"; }; grape-entity = { dependencies = ["activesupport" "multi_json"]; @@ -2740,21 +2741,21 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ql1acy68n9xkvjzda1vpscf20zqqwjm959b7cx3w1yl40d2f9rf"; + sha256 = "1mq2cwy0jvprq3wdilds1n865jdl58sqg00im4w6fybf5kjiclmd"; type = "gem"; }; - version = "1.7.1"; + version = "2.0.1"; }; grape-swagger = { - dependencies = ["grape"]; + dependencies = ["grape" "rack-test"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17y6smk7shplblgic4jvi5njhd0x91n1xrvds3l6cjsjfs2d7lhg"; + sha256 = "1467ni6f0yy4z3qldjs8x0h50n9ym6zyjbx5gqqzbq6zhvgbx40g"; type = "gem"; }; - version = "1.6.1"; + version = "2.0.1"; }; grape-swagger-entity = { dependencies = ["grape-entity" "grape-swagger"]; @@ -2913,10 +2914,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1shlh68vjqyj092ig2b571anbr5npg8kp66a7cq5h9a1387nnckn"; + sha256 = "060vz5dx0ag3ggpwhwfcadfim0g8aabl0b1dvnzagizymfsw2g92"; type = "gem"; }; - version = "0.52.0"; + version = "0.53.0"; }; hamlit = { dependencies = ["temple" "thor" "tilt"]; @@ -4040,10 +4041,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xk64wghkscs6bv2n22853k2nh39d131c6rfpnlw12mbjnnv9v1v"; + sha256 = "0xkjz56qc7hl7zy7i7bhiyw5pl85wwjsa4p70rj6s958xj2sd1lm"; type = "gem"; }; - version = "2.5.8"; + version = "2.7.0"; }; no_proxy_fix = { groups = ["default" "development"]; @@ -4061,10 +4062,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "004ip9x9281fxhpipwi8di1sb1dnabscq9dy1p3cxgdwbniqqi12"; + sha256 = "1l8b0i24h4irivyhwy9xmkjbggw86cxkzkiqdqg0jpcp9qc8h4rl"; type = "gem"; }; - version = "1.15.5"; + version = "1.16.0"; }; notiffany = { dependencies = ["nenv" "shellany"]; @@ -4466,21 +4467,21 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ldi3j95dh3c29w4bliykfdd08r95d4zvbdblk385w9b4knr2afc"; + sha256 = "1a3fbwzzzdsbzipv63mcq1q761mqc6w8k1vxkbrbf3aqi2489p8b"; type = "gem"; }; - version = "1.63.0"; + version = "1.64.0"; }; pact-mock_service = { - dependencies = ["filelock" "find_a_port" "json" "pact-support" "rack" "rspec" "term-ansicolor" "thor" "webrick"]; + dependencies = ["find_a_port" "json" "pact-support" "rack" "rspec" "thor" "webrick"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09syv4y0g0pvjshxj8i0yg7mrvszgp503is1b78k86bgv6wc73l9"; + sha256 = "0lds3xpkrx91lm74pa3n5167c8mkmqyki9axj7bjj0m18r2ybna2"; type = "gem"; }; - version = "3.10.0"; + version = "3.11.2"; }; pact-support = { dependencies = ["awesome_print" "diff-lcs" "expgen" "rainbow"]; @@ -4488,10 +4489,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xh4idg0m1mr0pkywj5f79nlr4g6n4waism86gj34h8wicf9c9aa"; + sha256 = "0waq8ywxhljm5sjk7m3q7f6s2pvcfshg3ncs9dl7kcsg2ail7hs1"; type = "gem"; }; - version = "1.18.1"; + version = "1.20.0"; }; parallel = { groups = ["development" "test"]; @@ -4509,10 +4510,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r69dbh6h6j4d54isany2ir4ni4gf2ysvk3k44awi6amz18nggpd"; + sha256 = "181faqz59p2mbfab5q4l1r298pq0nxl0k85rjcb58g0lardmv321"; type = "gem"; }; - version = "3.2.2.4"; + version = "3.3.0.2"; }; parslet = { groups = ["default" "development" "test"]; @@ -4625,10 +4626,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "172qxf1zyrhxzwbn4c7gz12zdyb1jkdqrqvb2c7863lmxp53rrxs"; + sha256 = "0qiv9irrca2la1awqgvzsg7a17z2nydqyq43w4fhapdkq2l7xwa7"; type = "gem"; }; - version = "0.18.0"; + version = "0.19.0"; }; proc_to_ast = { dependencies = ["coderay" "parser" "unparser"]; @@ -4647,10 +4648,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xfy4g3bwgqb1hn948aw3zfwxvak3886gxdyf0cnajzjfp9z33pq"; + sha256 = "19mi424kwalrzdm7cvzjx2w0rw778mxqb75y9wn20nc277nxglvb"; type = "gem"; }; - version = "1.0.2"; + version = "1.1.0"; }; protocol = { dependencies = ["ruby_parser"]; @@ -4834,6 +4835,17 @@ src: }; version = "0.7.7"; }; + rack-session = { + dependencies = ["rack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xhxhlsz6shh8nm44jsmd9276zcnyzii364vhcvf0k8b8bjia8d0"; + type = "gem"; + }; + version = "1.0.2"; + }; rack-test = { dependencies = ["rack"]; groups = ["default" "development" "test"]; @@ -4889,15 +4901,15 @@ src: version = "2.0.3"; }; rails-html-sanitizer = { - dependencies = ["loofah"]; - groups = ["default" "development" "test"]; + dependencies = ["loofah" "nokogiri"]; + groups = ["default" "development" "monorepo" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ygav4xyq943qqyhjmi3mzirn180j565mc9h5j4css59x1sn0cmz"; + sha256 = "1pm4z853nyz1bhhqr7fzl44alnx4bjachcr6rh6qjj375sfz3sc6"; type = "gem"; }; - version = "1.5.0"; + version = "1.6.0"; }; rails-i18n = { dependencies = ["i18n" "railties"]; @@ -4967,10 +4979,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pj5qq4phswviw9vybvz4ql5921ddxkkmn9iywm992x0kbvhvn0f"; + sha256 = "131sa2jvc7b1yld3nzc0xq7lvwvql7b8c09i0xv2brzjybammlv5"; type = "gem"; }; - version = "0.9.83"; + version = "0.9.86"; }; rbtrace = { dependencies = ["ffi" "msgpack" "optimist"]; @@ -5009,10 +5021,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ih6igmfcb4b9a8hd46ggn85zfyclz9h828d0xafy2pq5qlz9fs2"; + sha256 = "0sj80r3gy4sb27mrgc6pwcf2lra669p8p81axdv2p5pfm6k3mqbq"; type = "gem"; }; - version = "2.5.0"; + version = "2.6.0"; }; recaptcha = { dependencies = ["json"]; @@ -5071,10 +5083,21 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h4iq67p5jjkg9kny7ki6yzkivyakmhbp6ckkhl6mlnriw5avc9z"; + sha256 = "0h1mx8shrzpcj27k9kw77f4cq7i217vxfd1ksqb4g485md4zc37i"; type = "gem"; }; - version = "5.3.0"; + version = "5.4.0"; + }; + redis-client = { + dependencies = ["connection_pool"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0k9jaqsdc2s2qm713pdv19dawk1b11vxnfclsps7ra2szwisznbf"; + type = "gem"; + }; + version = "0.19.0"; }; redis-namespace = { dependencies = ["redis"]; @@ -5088,15 +5111,15 @@ src: version = "1.10.0"; }; redis-rack = { - dependencies = ["rack" "redis-store"]; + dependencies = ["rack-session" "redis-store"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k3pn706wnf7lb24l6hwsi00c8rx693hvgfnccw3qj1y635ywwh8"; + sha256 = "10438w0y1jbgr205zndvmz6md0mrqazh2j9fr88lvb8hms10pddb"; type = "gem"; }; - version = "2.1.4"; + version = "3.0.0"; }; redis-store = { dependencies = ["redis"]; @@ -5104,10 +5127,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0787fwmlvpx5k360dxlcs8r7vijgl2iyvh3zyvl7qyvgshw78k3v"; + sha256 = "17mhr1g3lmacrgjndbmrklngy32g55165n53111q70kykx7qjn7j"; type = "gem"; }; - version = "1.9.1"; + version = "1.10.0"; }; regexp_parser = { groups = ["default" "development" "test"]; @@ -5502,10 +5525,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zsd9ax4xzk8y1hflzbmfq1l0fpflwqhrggd8x2f4j9ap6z464lg"; + sha256 = "1g1vdas991rv6lrjppjxjbfyzif4jxbncrcg9shgzrmibzilbnwr"; type = "gem"; }; - version = "0.13.1"; + version = "0.13.2"; }; ruby-lsp-rails = { dependencies = ["actionpack" "activerecord" "railties" "ruby-lsp" "sorbet-runtime"]; @@ -5837,15 +5860,15 @@ src: version = "5.1.0"; }; sidekiq = { - dependencies = ["connection_pool" "rack" "redis"]; + dependencies = ["concurrent-ruby" "connection_pool" "rack" "redis-client"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zqr9is8y7mg5dfs1q8w5jl9spwvqkhbi9r6np8208n40hi3pydl"; + sha256 = "18j3g31ps6ga9nzza0z0d00qjrn810fhkhx2pqi3rvxwsmkdlnbq"; type = "gem"; }; - version = "6.5.12"; + version = "7.1.6"; }; sidekiq-cron = { dependencies = ["fugit" "globalid" "sidekiq"]; @@ -6670,10 +6693,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fa49cdssxllj1j37a56kq27wsibx5lmqxkqdk1rz3452y0bsydy"; + sha256 = "094gk72ckazf495qc76gk09b5i318d5l9m7bicg2wxlrjcm3qm96"; type = "gem"; }; - version = "0.12.2"; + version = "0.13.0"; }; uri_template = { groups = ["default"]; -- cgit 1.4.1