diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-09-12 08:14:37 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-09-12 08:14:37 +0000 |
| commit | 7d648ac22d941d0c7efdd987315ae0ddf9932ba0 (patch) | |
| tree | 51a3e8126722c5a52a9a1e7e40b4eeaf4610db0b /nixpkgs/pkgs/applications/version-management/gitlab | |
| parent | aa4353b499e6950b7333578f936455a628145c31 (diff) | |
| parent | db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b (diff) | |
| download | nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar.gz nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar.bz2 nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar.lz nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar.xz nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar.zst nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/applications/version-management/gitlab')
13 files changed, 595 insertions, 462 deletions
diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/data.json b/nixpkgs/pkgs/applications/version-management/gitlab/data.json index ea2d40f9234c..f1d776a55b9b 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/data.json +++ b/nixpkgs/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "16.1.3", - "repo_hash": "sha256-PI0nmwfk8uu74NJkavbbJR9/jDN9SS0Z9Axe4UmT2kk=", - "yarn_hash": "0wykn0vq16n8mz4jfh7dfyp9javzhqlfwmc5i1zm07gld91nirlm", + "version": "16.3.1", + "repo_hash": "sha256-E0aa+sUoc8CxQ4ucHOPJL3+A1Al23xWT0TpYSSpZxgc=", + "yarn_hash": "0lks2s0g7x7psdfmcq353z7gjp9lw1wm72hvkvw26fy21yglml6s", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v16.1.3-ee", + "rev": "v16.3.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "16.1.3", - "GITLAB_PAGES_VERSION": "16.1.3", - "GITLAB_SHELL_VERSION": "14.23.0", - "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.3.5", - "GITLAB_WORKHORSE_VERSION": "16.1.3" + "GITALY_SERVER_VERSION": "16.3.1", + "GITLAB_PAGES_VERSION": "16.3.1", + "GITLAB_SHELL_VERSION": "14.26.0", + "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.3.8", + "GITLAB_WORKHORSE_VERSION": "16.3.1" } } diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/default.nix b/nixpkgs/pkgs/applications/version-management/gitlab/default.nix index 69d8bd5df3b4..559058824340 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/default.nix @@ -33,15 +33,6 @@ let buildInputs = [ file ]; buildFlags = [ "--enable-system-libraries" ]; }; - # the included yarn rake task attaches the yarn:install task - # to assets:precompile, which is both unnecessary (since we - # run `yarn install` ourselves) and undoes the shebang patches - # in node_modules - railties = x.railties // { - dontBuild = false; - patches = [ ./railties-remove-yarn-install-enhancement.patch ]; - patchFlags = [ "-p2" ]; - }; }; groups = [ "default" "unicorn" "ed25519" "metrics" "development" "puma" "test" "kerberos" @@ -50,7 +41,7 @@ let # `console` executable. ignoreCollisions = true; - extraConfigPaths = [ "${src}/vendor" ]; + extraConfigPaths = [ "${src}/vendor" "${src}/gems" ]; }; assets = stdenv.mkDerivation { diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix index 2d35d06dc8a5..f7687f4cd302 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -13,7 +13,7 @@ }: let - version = "16.1.3"; + version = "16.3.1"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -24,10 +24,10 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-g9K1dFcrUkWJInPrwg9fz/TEK35GrjqFpUS2bnemwLQ="; + sha256 = "sha256-Tc7JsGuTF+JK5SLmaQwVbmdSy/Wvm3VNoZqHTyZFd6k="; }; - vendorSha256 = "sha256-6oOFQGPwiMRQrESXsQsGzvWz9bCb0VTYIyyG/C2b3nA="; + vendorSha256 = "sha256-abyouKgn31yO3+oeowtxZcuvS6mazVM8zOMEFsyw4C0="; ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ]; @@ -42,7 +42,7 @@ let auxBins = buildGoModule ({ pname = "gitaly-aux"; - subPackages = [ "cmd/gitaly-hooks" "cmd/gitaly-ssh" "cmd/gitaly-git2go" "cmd/gitaly-lfs-smudge" ]; + subPackages = [ "cmd/gitaly-hooks" "cmd/gitaly-ssh" "cmd/gitaly-git2go" "cmd/gitaly-lfs-smudge" "cmd/gitaly-gpg" ]; } // commonOpts); in buildGoModule ({ diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix index 62521099a7ec..c1e2935765ef 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gitlab-container-registry"; - version = "3.79.0"; + version = "3.82.0"; rev = "v${version}-gitlab"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "container-registry"; inherit rev; - sha256 = "sha256-JOXJ8HSTf7yW78SlYzbdn7IAbSwv/UE/W3oSJRyGrAQ="; + sha256 = "sha256-umlpGpeN7sWe8524+wjdYYJegLdc+eQqlgySLWL0a+k="; }; - vendorHash = "sha256-4cxfyG1uhqgIheAVDQbIDb4MRSqAUtLgxGYt5MuNfKw="; + vendorHash = "sha256-hFGuzTM9+Zb8BmUoFG059eqM53AzOmi1DeBnF68WSoc="; patches = [ ./Disable-inmemory-storage-driver-test.patch diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix index a52a9a753848..803f335ac197 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix @@ -2,16 +2,17 @@ buildGoModule rec { pname = "gitlab-elasticsearch-indexer"; - version = "4.3.5"; + version = "4.3.8"; + # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-elasticsearch-indexer"; rev = "v${version}"; - sha256 = "sha256-2idvN92H4Cc1W71gADrsuUl3+f2weAvL2MOP19NO/3I="; + sha256 = "sha256-CePFRk+Dpndv4BtINUn8/Y4fhuO4sCyh4+erjfIHZvI="; }; - vendorHash = "sha256-7LqzuBVYqpPI2thIJu4kQgCZGMlBlKI8L+j7AdUYrgQ="; + vendorHash = "sha256-SEYHROFFaR7m7K6l4+zipX0QNYWpbf8qI4pAp1pKAsY="; buildInputs = [ icu ]; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 7fcc652056bf..721d5610661d 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "16.1.3"; + version = "16.3.1"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - sha256 = "sha256-FSdew0HMbgEAzVoDhINDIQQs8Q63AHu8mu/dKo+wP9k="; + sha256 = "sha256-gUUmUVBk6Ox4oKOef8RDqmW2Hs2wQL/lpbIEbwbzgHY="; }; - vendorHash = "sha256-SN4r9hcTTQUr3miv2Cm7iBryyh7yG1xx9lCvq3vQwc0="; + vendorHash = "sha256-Pdb+bWsECe7chgvPKFGXxVAWb+AbGF6khVJSdDsHqKM="; subPackages = [ "." ]; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index b3b4fc310588..67eb6ea7990c 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "14.23.0"; + version = "14.26.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-nQJq9aPC5YtTbyiwtzKwDG95PnBr6XdNpSIJkfgvnzU="; + sha256 = "sha256-nDnPldBQy4Zg0uZshxSmcEl0ggmqg6CyNWc/I3szonI="; }; buildInputs = [ ruby libkrb5 ]; patches = [ ./remove-hardcoded-locations.patch ]; - vendorSha256 = "sha256-JEWgOuWvtuaipF8fFTsFbB+sYfaHEYUl9Z8Q1XAuJuE="; + vendorSha256 = "sha256-Lqo0fdrYEHOKjF/XT3c1VjVQc1YxeBy6yW69IxXZAow="; postInstall = '' cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 9b19ec2aec61..add712596244 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "16.1.3"; + version = "16.3.1"; src = fetchFromGitLab { owner = data.owner; @@ -16,7 +16,7 @@ buildGoModule rec { sourceRoot = "${src.name}/workhorse"; - vendorSha256 = "sha256-lKl/V2fti0eqrEoeJNNwvJbZO7z7v+5HlES+dyxxcP4="; + vendorSha256 = "sha256-Gitap0cWRubtWLJcT8oVg9FKcN9FhXbVy/t2tgaZ93Q="; buildInputs = [ git ]; ldflags = [ "-X main.Version=${version}" ]; doCheck = false; diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/railties-remove-yarn-install-enhancement.patch b/nixpkgs/pkgs/applications/version-management/gitlab/railties-remove-yarn-install-enhancement.patch deleted file mode 100644 index 25cbf775e635..000000000000 --- a/nixpkgs/pkgs/applications/version-management/gitlab/railties-remove-yarn-install-enhancement.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/railties/lib/rails/tasks/yarn.rake b/railties/lib/rails/tasks/yarn.rake -index 0226da721a..365cdeb0f9 100644 ---- a/railties/lib/rails/tasks/yarn.rake -+++ b/railties/lib/rails/tasks/yarn.rake -@@ -27,8 +27,3 @@ namespace :yarn do - exit 1 - end - end -- --# Run Yarn prior to Sprockets assets precompilation, so dependencies are available for use. --if Rake::Task.task_defined?("assets:precompile") && File.exist?(Rails.root.join("bin", "yarn")) -- Rake::Task["assets:precompile"].enhance [ "yarn:install" ] --end diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index ef5a22d20140..a31ae24ecbc3 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -13,13 +13,24 @@ gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', requir # NOTE: When incrementing the major or minor version here, also increment activerecord_version # in vendor/gems/attr_encrypted/attr_encrypted.gemspec until we resolve # https://gitlab.com/gitlab-org/gitlab/-/issues/375713 -gem 'rails', '~> 6.1.7.2' +# +# See https://docs.gitlab.com/ee/development/gemfile.html#upgrade-rails for guidelines when upgrading Rails +gem 'rails', '~> 7.0.6' + +gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab' gem 'bootsnap', '~> 1.16.0', require: false gem 'openssl', '~> 3.0' gem 'ipaddr', '~> 1.2.5' +gem 'gitlab-safe_request_store', path: 'gems/gitlab-safe_request_store' + +# GitLab Monorepo Gems +group :monorepo do + gem 'gitlab-utils', path: 'gems/gitlab-utils' +end + # Responders respond_to and respond_with gem 'responders', '~> 3.0' @@ -32,7 +43,7 @@ gem 'pg', '~> 1.5.3' gem 'neighbor', '~> 0.2.3' -gem 'rugged', '~> 1.5' +gem 'rugged', '~> 1.6' gem 'grape-path-helpers', '~> 1.7.1' gem 'faraday', '~> 1.0' @@ -61,7 +72,7 @@ gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See ven gem 'omniauth-google-oauth2', '~> 1.1' gem 'omniauth-oauth2-generic', '~> 0.2.2' gem 'omniauth-saml', '~> 2.1.0' -gem 'omniauth-shibboleth-redux', '~> 2.0' +gem 'omniauth-shibboleth-redux', '~> 2.0', require: 'omniauth-shibboleth' gem 'omniauth-twitter', '~> 1.4' gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md gem 'omniauth_openid_connect', '~> 0.6.1' @@ -106,10 +117,10 @@ gem 'gpgme', '~> 2.0.22' # 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.2.0', require: 'omniauth-ldap' -gem 'net-ldap', '~> 0.18.0' +gem 'net-ldap', '~> 0.17.1' # API -gem 'grape', '~> 1.7.0' +gem 'grape', '~> 1.7.1' gem 'grape-entity', '~> 0.10.0' gem 'rack-cors', '~> 1.1.1', require: 'rack/cors' gem 'grape-swagger', '~> 1.6.1', group: [:development, :test] @@ -122,6 +133,9 @@ gem 'apollo_upload_server', '~> 2.1.0' gem 'graphql-docs', '~> 2.1.0', group: [:development, :test] gem 'graphlient', '~> 0.5.0' # Used by BulkImport feature (group::import) +# Generate Fake data +gem 'ffaker', '~> 2.10' + gem 'hashie', '~> 5.0.0' # Pagination @@ -148,7 +162,7 @@ gem 'fog-local', '~> 0.8' # 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' -gem 'gitlab-fog-azure-rm', '~> 1.7.0', require: 'fog/azurerm' +gem 'gitlab-fog-azure-rm', '~> 1.8.0', require: 'fog/azurerm' # for Google storage gem 'google-cloud-storage', '~> 1.44.0' @@ -173,9 +187,9 @@ gem 'seed-fu', '~> 2.3.7' gem 'elasticsearch-model', '~> 7.2' gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' gem 'elasticsearch-api', '7.13.3' -gem 'aws-sdk-core', '~> 3.175.0' +gem 'aws-sdk-core', '~> 3.180.3' gem 'aws-sdk-cloudformation', '~> 1' -gem 'aws-sdk-s3', '~> 1.126.0' +gem 'aws-sdk-s3', '~> 1.132.1' gem 'faraday_middleware-aws-sigv4', '~>0.3.0' gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections @@ -183,7 +197,7 @@ gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive gem 'html-pipeline', '~> 2.14.3' gem 'deckar01-task_list', '2.3.2' gem 'gitlab-markup', '~> 1.9.0', require: 'github/markup' -gem 'commonmarker', '~> 0.23.9' +gem 'commonmarker', '~> 0.23.10' gem 'kramdown', '~> 2.3.1' gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~> 6.3.2' @@ -194,9 +208,9 @@ gem 'asciidoctor', '~> 2.0.18' gem 'asciidoctor-include-ext', '~> 0.4.0', require: false gem 'asciidoctor-plantuml', '~> 0.0.16' gem 'asciidoctor-kroki', '~> 0.8.0', require: false -gem 'rouge', '~> 4.1.2' +gem 'rouge', '~> 4.1.3' gem 'truncato', '~> 0.7.12' -gem 'nokogiri', '~> 1.15', '>= 1.15.2' +gem 'nokogiri', '~> 1.15', '>= 1.15.4' # Calendar rendering gem 'icalendar' @@ -206,7 +220,7 @@ gem 'diffy', '~> 3.4' gem 'diff_match_patch', '~> 0.1.0' # Application server -gem 'rack', '~> 2.2.7' +gem 'rack', '~> 2.2.8' # https://github.com/zombocom/rack-timeout/blob/master/README.md#rails-apps-manually gem 'rack-timeout', '~> 0.6.3', require: 'rack/timeout/base' @@ -240,12 +254,13 @@ gem 'rainbow', '~> 3.0' gem 'ruby-progressbar', '~> 1.10' # Linear-time regex library for untrusted regular expressions -gem 're2', '~> 1.6.0' +gem 're2', '~> 1.7.0' # Misc gem 'semver_dialects', '~> 1.2.1' gem 'version_sorter', '~> 2.3' +gem 'csv_builder', path: 'gems/csv_builder' # Export Ruby Regex to Javascript gem 'js_regex', '~> 3.8' @@ -317,6 +332,7 @@ gem 'sassc-rails', '~> 2.1.0' gem 'autoprefixer-rails', '10.2.5.1' gem 'terser', '1.0.2' +gem 'click_house-client', path: 'gems/click_house-client', require: 'click_house/client' gem 'addressable', '~> 2.8' gem 'tanuki_emoji', '~> 0.6' gem 'gon', '~> 6.4.0' @@ -326,7 +342,7 @@ gem 'base32', '~> 0.3.0' gem 'gitlab-license', '~> 2.3' # Protect against bruteforcing -gem 'rack-attack', '~> 6.6.1' +gem 'rack-attack', '~> 6.7.0' # Sentry integration gem 'sentry-raven', '~> 3.1' @@ -336,17 +352,19 @@ gem 'sentry-sidekiq', '~> 5.8.0' # PostgreSQL query parsing # -gem 'pg_query', '~> 4.2.1' +gem 'pg_query', '~> 4.2.3' + +gem 'gitlab-schema-validation', path: 'gems/gitlab-schema-validation' gem 'premailer-rails', '~> 1.10.3' -gem 'gitlab-labkit', '~> 0.33.0' +gem 'gitlab-labkit', '~> 0.34.0' gem 'thrift', '>= 0.16.0' # I18n gem 'ruby_parser', '~> 3.20', require: false gem 'rails-i18n', '~> 7.0' -gem 'gettext_i18n_rails', '~> 1.8.0' +gem 'gettext_i18n_rails', '~> 1.11.0' gem 'gettext_i18n_rails_js', '~> 1.3' gem 'gettext', '~> 3.3', require: false, group: :development @@ -363,12 +381,12 @@ gem 'snowplow-tracker', '~> 0.8.0' # Metrics gem 'webrick', '~> 1.8.1', require: false -gem 'prometheus-client-mmap', '~> 0.25', require: 'prometheus/client' +gem 'prometheus-client-mmap', '~> 0.27', require: 'prometheus/client' gem 'warning', '~> 1.3.0' group :development do - gem 'lefthook', '~> 1.4.2', require: false + gem 'lefthook', '~> 1.4.7', require: false gem 'rubocop' gem 'solargraph', '~> 0.47.2', require: false @@ -389,24 +407,21 @@ group :development, :test do gem 'parser', '~> 3.2', '>= 3.2.2.3' gem 'pry-byebug' gem 'pry-rails', '~> 0.3.9' - gem 'pry-shell', '~> 0.6.1' + gem 'pry-shell', '~> 0.6.4' gem 'awesome_print', require: false gem 'database_cleaner', '~> 1.7.0' gem 'factory_bot_rails', '~> 6.2.0' - gem 'rspec-rails', '~> 6.0.1' + gem 'rspec-rails', '~> 6.0.3' # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) gem 'minitest', '~> 5.11.0' - # Generate Fake data - gem 'ffaker', '~> 2.10' - gem 'spring', '~> 4.1.0' gem 'spring-commands-rspec', '~> 1.0.4' - gem 'gitlab-styles', '~> 10.0.0', require: false + gem 'gitlab-styles', '~> 10.1.0', require: false gem 'haml_lint', '~> 0.40.0', require: false gem 'bundler-audit', '~> 0.7.0.1', require: false @@ -432,13 +447,13 @@ group :development, :test do end group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 3.10.0', require: false + gem 'gitlab-dangerfiles', '~> 3.13.0', require: false end group :development, :test, :coverage do gem 'simplecov', '~> 0.21', require: false gem 'simplecov-lcov', '~> 0.8.0', require: false - gem 'simplecov-cobertura', '~> 1.3.1', require: false + gem 'simplecov-cobertura', '~> 2.1.0', require: false gem 'undercover', '~> 0.4.4', require: false end @@ -447,6 +462,12 @@ group :development, :test, :omnibus do gem 'license_finder', '~> 7.0', require: false end +# Gems required in various pipelines +group :development, :test, :monorepo do + gem 'gitlab-rspec', path: 'gems/gitlab-rspec' + gem 'rspec_flaky', path: 'gems/rspec_flaky' +end + group :test do gem 'fuubar', '~> 2.2.0' gem 'rspec-retry', '~> 0.6.2' @@ -454,10 +475,9 @@ group :test do gem 'rspec-benchmark', '~> 0.6.0' gem 'rspec-parameterized', '~> 1.0', require: false - gem 'capybara', '~> 3.39', '>= 3.39.1' + gem 'capybara', '~> 3.39', '>= 3.39.2' gem 'capybara-screenshot', '~> 1.0.26' - # 4.9.1 drops Ruby 2.7 support. We can upgrade further after we drop Ruby 2.7 support. - gem 'selenium-webdriver', '= 4.9.0' + gem 'selenium-webdriver', '= 4.11.0' gem 'graphlyte', '~> 1.0.0' @@ -466,7 +486,7 @@ group :test do gem 'webmock', '~> 3.18.1' gem 'rails-controller-testing' gem 'concurrent-ruby', '~> 1.1' - gem 'test-prof', '~> 1.2.1' + gem 'test-prof', '~> 1.2.2' gem 'rspec_junit_formatter' gem 'guard-rspec' gem 'axe-core-rspec' @@ -474,7 +494,7 @@ group :test do # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 gem 'derailed_benchmarks', require: false - gem 'gitlab_quality-test_tooling', '~> 0.8.1', require: false + gem 'gitlab_quality-test_tooling', '~> 0.9.3', require: false end gem 'octokit', '~> 4.15' @@ -509,14 +529,14 @@ gem 'ssh_data', '~> 1.3' gem 'spamcheck', '~> 1.3.0' # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 16.1.0-rc2' +gem 'gitaly', '~> 16.2.0-rc4' # KAS GRPC protocol definitions -gem 'kas-grpc', '~> 0.1.0' +gem 'kas-grpc', '~> 0.2.0' -gem 'grpc', '~> 1.42.0' +gem 'grpc', '~> 1.55.0' -gem 'google-protobuf', '~> 3.23', '>= 3.23.3' +gem 'google-protobuf', '~> 3.23', '>= 3.23.4' gem 'toml-rb', '~> 2.2.0' @@ -561,6 +581,7 @@ gem 'lockbox', '~> 1.1.1' gem 'valid_email', '~> 0.1' # JSON +gem 'jsonb_accessor', '~> 1.3.10' gem 'json', '~> 2.6.3' gem 'json_schemer', '~> 0.2.18' gem 'oj', '~> 3.13.21' @@ -575,13 +596,13 @@ gem 'ipaddress', '~> 0.8.3' gem 'parslet', '~> 1.8' -gem 'ipynbdiff', path: 'vendor/gems/ipynbdiff' +gem 'ipynbdiff', path: 'gems/ipynbdiff', require: 'ipynb_diff' gem 'ed25519', '~> 1.3.0' # 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: 'vendor/gems/error_tracking_open_api' +gem 'error_tracking_open_api', path: 'gems/error_tracking_open_api' # Vulnerability advisories gem 'cvss-suite', '~> 3.0.1', require: 'cvss_suite' @@ -590,7 +611,7 @@ gem 'cvss-suite', '~> 3.0.1', require: 'cvss_suite' gem 'arr-pm', '~> 0.0.12' # Remote Development -gem 'devfile', '~> 0.0.19.pre.alpha1' +gem 'devfile', '~> 0.0.22.pre.alpha1' # Apple plist parsing gem 'CFPropertyList', '~> 3.0.0' diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 3aaf6a459309..cf94510e923e 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -1,4 +1,73 @@ PATH + remote: gems/activerecord-gitlab + specs: + activerecord-gitlab (0.2.0) + activerecord (>= 7) + +PATH + remote: gems/click_house-client + specs: + click_house-client (0.1.0) + activesupport (< 8) + addressable (~> 2.8) + json (~> 2.6.3) + +PATH + remote: gems/csv_builder + specs: + csv_builder (0.1.0) + +PATH + remote: gems/error_tracking_open_api + specs: + error_tracking_open_api (1.0.0) + typhoeus (~> 1.0, >= 1.0.1) + +PATH + remote: gems/gitlab-rspec + specs: + gitlab-rspec (0.1.0) + activesupport (>= 6.1, < 7.1) + rspec (~> 3.0) + +PATH + remote: gems/gitlab-safe_request_store + specs: + gitlab-safe_request_store (0.1.0) + request_store + +PATH + remote: gems/gitlab-schema-validation + specs: + gitlab-schema-validation (0.1.0) + diffy + pg_query + +PATH + remote: gems/gitlab-utils + specs: + gitlab-utils (0.1.0) + actionview (>= 6.1.7.2) + activesupport (>= 6.1.7.2) + addressable (~> 2.8) + nokogiri (~> 1.15.2) + rake (~> 13.0) + +PATH + remote: gems/ipynbdiff + specs: + ipynbdiff (0.4.7) + diffy (~> 3.4) + oj (~> 3.13.16) + +PATH + remote: gems/rspec_flaky + specs: + rspec_flaky (0.1.0) + activesupport (>= 6.1, < 7.1) + rspec (~> 3.0) + +PATH remote: vendor/gems/attr_encrypted specs: attr_encrypted (3.2.4) @@ -27,19 +96,6 @@ PATH devise-two-factor (~> 4.0) PATH - remote: vendor/gems/error_tracking_open_api - specs: - error_tracking_open_api (1.0.0) - typhoeus (~> 1.0, >= 1.0.1) - -PATH - remote: vendor/gems/ipynbdiff - specs: - ipynbdiff (0.4.7) - diffy (~> 3.4) - oj (~> 3.13.16) - -PATH remote: vendor/gems/mail-smtp_pool specs: mail-smtp_pool (0.1.0) @@ -99,69 +155,75 @@ GEM acme-client (2.0.11) faraday (>= 1.0, < 3.0.0) faraday-retry (~> 1.0) - actioncable (6.1.7.2) - actionpack (= 6.1.7.2) - activesupport (= 6.1.7.2) + actioncable (7.0.6) + actionpack (= 7.0.6) + activesupport (= 7.0.6) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.7.2) - actionpack (= 6.1.7.2) - activejob (= 6.1.7.2) - activerecord (= 6.1.7.2) - activestorage (= 6.1.7.2) - activesupport (= 6.1.7.2) + actionmailbox (7.0.6) + actionpack (= 7.0.6) + activejob (= 7.0.6) + activerecord (= 7.0.6) + activestorage (= 7.0.6) + activesupport (= 7.0.6) mail (>= 2.7.1) - actionmailer (6.1.7.2) - actionpack (= 6.1.7.2) - actionview (= 6.1.7.2) - activejob (= 6.1.7.2) - activesupport (= 6.1.7.2) + net-imap + net-pop + net-smtp + actionmailer (7.0.6) + actionpack (= 7.0.6) + actionview (= 7.0.6) + activejob (= 7.0.6) + activesupport (= 7.0.6) mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp rails-dom-testing (~> 2.0) - actionpack (6.1.7.2) - actionview (= 6.1.7.2) - activesupport (= 6.1.7.2) - rack (~> 2.0, >= 2.0.9) + actionpack (7.0.6) + actionview (= 7.0.6) + activesupport (= 7.0.6) + rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.7.2) - actionpack (= 6.1.7.2) - activerecord (= 6.1.7.2) - activestorage (= 6.1.7.2) - activesupport (= 6.1.7.2) + actiontext (7.0.6) + actionpack (= 7.0.6) + activerecord (= 7.0.6) + activestorage (= 7.0.6) + activesupport (= 7.0.6) + globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (6.1.7.2) - activesupport (= 6.1.7.2) + actionview (7.0.6) + activesupport (= 7.0.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.7.2) - activesupport (= 6.1.7.2) + activejob (7.0.6) + activesupport (= 7.0.6) globalid (>= 0.3.6) - activemodel (6.1.7.2) - activesupport (= 6.1.7.2) - activerecord (6.1.7.2) - activemodel (= 6.1.7.2) - activesupport (= 6.1.7.2) + activemodel (7.0.6) + activesupport (= 7.0.6) + activerecord (7.0.6) + activemodel (= 7.0.6) + activesupport (= 7.0.6) activerecord-explain-analyze (0.1.0) activerecord (>= 4) pg - activestorage (6.1.7.2) - actionpack (= 6.1.7.2) - activejob (= 6.1.7.2) - activerecord (= 6.1.7.2) - activesupport (= 6.1.7.2) + activestorage (7.0.6) + actionpack (= 7.0.6) + activejob (= 7.0.6) + activerecord (= 7.0.6) + activesupport (= 7.0.6) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.7.2) + activesupport (7.0.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - zeitwerk (~> 2.3) - acts-as-taggable-on (9.0.0) + acts-as-taggable-on (9.0.1) activerecord (>= 6.0, < 7.1) addressable (2.8.1) public_suffix (>= 2.0.2, < 6.0) @@ -203,7 +265,7 @@ GEM aws-sdk-cloudformation (1.41.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.175.0) + aws-sdk-core (3.180.3) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) @@ -211,11 +273,11 @@ GEM aws-sdk-kms (1.64.0) aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.126.0) - aws-sdk-core (~> 3, >= 3.174.0) + aws-sdk-s3 (1.132.1) + aws-sdk-core (~> 3, >= 3.179.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.4) - aws-sigv4 (1.5.1) + aws-sigv4 (~> 1.6) + aws-sigv4 (1.6.0) aws-eventstream (~> 1, >= 1.0.2) axe-core-api (4.6.0) dumb_delegator @@ -240,7 +302,7 @@ GEM backport (1.2.0) base32 (0.3.2) batch-loader (2.0.1) - bcrypt (3.1.16) + bcrypt (3.1.18) benchmark (0.2.0) benchmark-ips (2.11.0) benchmark-malloc (0.2.0) @@ -266,7 +328,7 @@ GEM bundler (>= 1.2.0, < 3) thor (>= 0.18, < 2) byebug (11.1.3) - capybara (3.39.1) + capybara (3.39.2) addressable matrix mini_mime (>= 0.1.3) @@ -307,7 +369,7 @@ GEM coercible (1.0.0) descendants_tracker (~> 0.0.1) colored2 (3.1.2) - commonmarker (0.23.9) + commonmarker (0.23.10) concurrent-ruby (1.2.2) connection_pool (2.3.0) cork (0.3.0) @@ -367,7 +429,7 @@ GEM thor (>= 0.19, < 2) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devfile (0.0.19.pre.alpha1) + devfile (0.0.22.pre.alpha1) device_detector (1.0.0) devise (4.8.1) bcrypt (~> 3.0) @@ -466,9 +528,6 @@ GEM faraday-rack (~> 1.0) faraday-retry (~> 1.0) ruby2_keywords (>= 0.0.4) - faraday-cookie_jar (0.0.7) - faraday (>= 0.8.0) - http-cookie (~> 1.0.0) faraday-em_http (1.0.0) faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) @@ -497,8 +556,8 @@ GEM ffi-compiler (1.0.1) ffi (>= 1.0.0) rake - ffi-yajl (2.3.4) - libyajl2 (~> 1.2) + ffi-yajl (2.6.0) + libyajl2 (>= 1.2) filelock (1.1.1) find_a_port (1.0.1) flipper (0.25.0) @@ -566,7 +625,7 @@ GEM gettext (3.3.6) locale (>= 2.0.5) text (>= 1.3.0) - gettext_i18n_rails (1.8.0) + gettext_i18n_rails (1.11.0) fast_gettext (>= 0.9.0) gettext_i18n_rails_js (1.3.0) gettext (>= 3.0.2) @@ -575,34 +634,33 @@ GEM rails (>= 3.2.0) git (1.11.0) rchardet (~> 1.8) - gitaly (16.1.0.pre.rc2) + gitaly (16.2.0.pre.rc4) grpc (~> 1.0) gitlab (4.19.0) httparty (~> 0.20) terminal-table (>= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-dangerfiles (3.10.0) + gitlab-dangerfiles (3.13.0) danger (>= 8.4.5) danger-gitlab (>= 8.0.0) rake gitlab-experiment (0.7.1) activesupport (>= 3.0) request_store (>= 1.0) - gitlab-fog-azure-rm (1.7.0) + gitlab-fog-azure-rm (1.8.0) azure-storage-blob (~> 2.0) azure-storage-common (~> 2.0) fog-core (= 2.1.0) fog-json (~> 1.2.0) mime-types - ms_rest_azure (~> 0.12.0) - gitlab-labkit (0.33.0) + gitlab-labkit (0.34.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.1) + pg_query (~> 4.2.3) redis (> 3.0.0, < 6.0.0) gitlab-license (2.3.0) gitlab-mail_room (0.0.23) @@ -611,12 +669,12 @@ GEM oauth2 (>= 1.4.4, < 3) gitlab-markup (1.9.0) gitlab-net-dns (0.9.2) - gitlab-styles (10.0.0) - rubocop (~> 1.43.0) + gitlab-styles (10.1.0) + rubocop (~> 1.50.2) rubocop-graphql (~> 0.18) rubocop-performance (~> 1.15) rubocop-rails (~> 2.17) - rubocop-rspec (~> 2.18) + rubocop-rspec (~> 2.22) gitlab_chronic_duration (0.10.6.2) numerizer (~> 0.2) gitlab_omniauth-ldap (2.2.0) @@ -624,7 +682,7 @@ GEM omniauth (>= 1.3, < 3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) rubyntlm (~> 0.5) - gitlab_quality-test_tooling (0.8.1) + gitlab_quality-test_tooling (0.9.3) activesupport (>= 6.1, < 7.1) gitlab (~> 4.19) http (~> 5.0) @@ -694,7 +752,7 @@ GEM google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - google-protobuf (3.23.3) + google-protobuf (3.23.4) googleapis-common-protos (1.4.0) google-protobuf (~> 3.14) googleapis-common-protos-types (~> 1.2) @@ -710,12 +768,12 @@ GEM signet (>= 0.16, < 2.a) gpgme (2.0.22) mini_portile2 (~> 2.7) - grape (1.7.0) + grape (1.7.1) activesupport builder dry-types (>= 1.1) mustermann-grape (~> 1.0.0) - rack (>= 1.3.0) + rack (>= 1.3.0, < 3) rack-accept grape-entity (0.10.0) activesupport (>= 3.0.0) @@ -753,8 +811,8 @@ GEM graphql (~> 1.12) html-pipeline (~> 2.9) sass (~> 3.4) - grpc (1.42.0) - google-protobuf (~> 3.18) + grpc (1.55.0) + google-protobuf (~> 3.23) googleapis-common-protos-types (~> 1.0) gssapi (1.3.1) ffi (>= 1.0.1) @@ -851,6 +909,10 @@ GEM hana (~> 1.3) regexp_parser (~> 2.0) uri_template (~> 0.7) + jsonb_accessor (1.3.10) + activerecord (>= 5.0) + activesupport (>= 5.0) + pg (>= 0.18.1) jsonpath (1.1.2) multi_json jwt (2.5.0) @@ -866,7 +928,7 @@ GEM activerecord kaminari-core (= 1.2.2) kaminari-core (1.2.2) - kas-grpc (0.1.0) + kas-grpc (0.2.0) grpc (~> 1.0) knapsack (1.21.1) rake @@ -881,7 +943,7 @@ GEM rest-client (~> 2.0) launchy (2.5.0) addressable (~> 2.7) - lefthook (1.4.2) + lefthook (1.4.7) letter_opener (1.7.0) launchy (~> 2.2) letter_opener_web (2.0.0) @@ -960,15 +1022,6 @@ GEM mixlib-log (3.0.9) mixlib-shellout (3.2.5) chef-utils - ms_rest (0.7.6) - concurrent-ruby (~> 1.0) - faraday (>= 0.9, < 2.0.0) - timeliness (~> 0.3.10) - ms_rest_azure (0.12.0) - concurrent-ruby (~> 1.0) - faraday (>= 0.9, < 2.0.0) - faraday-cookie_jar (~> 0.0.6) - ms_rest (~> 0.7.6) msgpack (1.5.4) multi_json (1.14.1) multi_xml (0.6.0) @@ -990,7 +1043,7 @@ GEM net-imap (0.3.4) date net-protocol - net-ldap (0.18.0) + net-ldap (0.17.1) net-ntp (2.1.3) net-pop (0.1.2) net-protocol @@ -1004,7 +1057,7 @@ GEM netrc (0.11.0) nio4r (2.5.8) no_proxy_fix (0.1.2) - nokogiri (1.15.2) + nokogiri (1.15.4) mini_portile2 (~> 2.8.2) racc (~> 1.4) notiffany (0.1.3) @@ -1137,7 +1190,7 @@ GEM peek (1.1.0) railties (>= 4.0.0) pg (1.5.3) - pg_query (4.2.1) + pg_query (4.2.3) google-protobuf (>= 3.22.3) plist (3.6.0) png_quantizator (0.2.1) @@ -1154,7 +1207,7 @@ GEM coderay parser unparser - prometheus-client-mmap (0.25.0) + prometheus-client-mmap (0.27.0) rb_sys (~> 0.9) pry (0.14.2) coderay (~> 1.1) @@ -1164,7 +1217,7 @@ GEM pry (>= 0.13, < 0.15) pry-rails (0.3.9) pry (>= 0.10.4) - pry-shell (0.6.1) + pry-shell (0.6.4) pry (>= 0.13.0) tty-markdown tty-prompt @@ -1174,11 +1227,11 @@ GEM pyu-ruby-sasl (0.0.3.3) raabro (1.4.0) racc (1.6.2) - rack (2.2.7) + rack (2.2.8) rack-accept (0.4.5) rack (>= 0.4) - rack-attack (6.6.1) - rack (>= 1.0, < 3) + rack-attack (6.7.0) + rack (>= 1.0, < 4) rack-cors (1.1.1) rack (>= 2.0.0) rack-oauth2 (1.21.3) @@ -1191,24 +1244,23 @@ GEM rack rack-proxy (0.7.6) rack - rack-test (2.0.2) + rack-test (2.1.0) rack (>= 1.3) rack-timeout (0.6.3) - rails (6.1.7.2) - actioncable (= 6.1.7.2) - actionmailbox (= 6.1.7.2) - actionmailer (= 6.1.7.2) - actionpack (= 6.1.7.2) - actiontext (= 6.1.7.2) - actionview (= 6.1.7.2) - activejob (= 6.1.7.2) - activemodel (= 6.1.7.2) - activerecord (= 6.1.7.2) - activestorage (= 6.1.7.2) - activesupport (= 6.1.7.2) + rails (7.0.6) + actioncable (= 7.0.6) + actionmailbox (= 7.0.6) + actionmailer (= 7.0.6) + actionpack (= 7.0.6) + actiontext (= 7.0.6) + actionview (= 7.0.6) + activejob (= 7.0.6) + activemodel (= 7.0.6) + activerecord (= 7.0.6) + activestorage (= 7.0.6) + activesupport (= 7.0.6) bundler (>= 1.15.0) - railties (= 6.1.7.2) - sprockets-rails (>= 2.0.0) + railties (= 7.0.6) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -1221,12 +1273,13 @@ GEM rails-i18n (7.0.3) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (6.1.7.2) - actionpack (= 6.1.7.2) - activesupport (= 6.1.7.2) + railties (7.0.6) + actionpack (= 7.0.6) + activesupport (= 7.0.6) method_source rake (>= 12.2) thor (~> 1.0) + zeitwerk (~> 2.5) rainbow (3.1.1) rake (13.0.6) rb-fsevent (0.11.2) @@ -1240,7 +1293,7 @@ GEM rbtree (0.4.6) rchardet (1.8.0) rdoc (6.3.2) - re2 (1.6.0) + re2 (1.7.0) recaptcha (5.12.3) json recursive-open-struct (1.1.3) @@ -1265,7 +1318,7 @@ GEM uber (< 0.2.0) request_store (1.5.1) rack (>= 1.4) - responders (3.0.0) + responders (3.0.1) actionpack (>= 5.0) railties (>= 5.0) rest-client (2.1.0) @@ -1279,7 +1332,7 @@ GEM rexml (3.2.5) rinku (2.0.0) rotp (6.2.0) - rouge (4.1.2) + rouge (4.1.3) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) @@ -1293,12 +1346,12 @@ GEM benchmark-perf (~> 0.6) benchmark-trend (~> 0.4) rspec (>= 3.0) - rspec-core (3.12.0) + rspec-core (3.12.2) rspec-support (~> 3.12.0) - rspec-expectations (3.12.2) + rspec-expectations (3.12.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-mocks (3.12.3) + rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) rspec-parameterized (1.0.0) @@ -1312,14 +1365,14 @@ GEM rspec-parameterized-table_syntax (1.0.0) binding_of_caller rspec-parameterized-core (< 2) - rspec-rails (6.0.1) + rspec-rails (6.0.3) actionpack (>= 6.1) activesupport (>= 6.1) railties (>= 6.1) - rspec-core (~> 3.11) - rspec-expectations (~> 3.11) - rspec-mocks (~> 3.11) - rspec-support (~> 3.11) + rspec-core (~> 3.12) + rspec-expectations (~> 3.12) + rspec-mocks (~> 3.12) + rspec-support (~> 3.12) rspec-retry (0.6.2) rspec-core (> 3.3) rspec-support (3.12.0) @@ -1330,32 +1383,35 @@ GEM pg rails sqlite3 - rubocop (1.43.0) + rubocop (1.50.2) json (~> 2.3) parallel (~> 1.10) parser (>= 3.2.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.24.1, < 2.0) + rubocop-ast (>= 1.28.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.24.1) - parser (>= 3.1.1.0) - rubocop-capybara (2.17.0) + rubocop-ast (1.29.0) + parser (>= 3.2.1.0) + rubocop-capybara (2.18.0) rubocop (~> 1.41) + rubocop-factory_bot (2.23.1) + rubocop (~> 1.33) rubocop-graphql (0.19.0) rubocop (>= 0.87, < 2) - rubocop-performance (1.16.0) + rubocop-performance (1.18.0) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.17.4) + rubocop-rails (2.20.2) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) - rubocop-rspec (2.18.1) + rubocop-rspec (2.22.0) rubocop (~> 1.33) rubocop-capybara (~> 2.17) + rubocop-factory_bot (~> 2.22) ruby-fogbugz (0.3.0) crack (~> 0.4) multipart-post (~> 2.0) @@ -1374,7 +1430,7 @@ GEM rubyntlm (0.6.3) rubypants (0.2.0) rubyzip (2.3.2) - rugged (1.5.1) + rugged (1.6.3) safe_yaml (1.0.4) safety_net_attestation (0.4.0) jwt (~> 2.0) @@ -1401,7 +1457,7 @@ GEM seed-fu (2.3.7) activerecord (>= 3.1) activesupport (>= 3.1) - selenium-webdriver (4.9.0) + selenium-webdriver (4.11.0) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) @@ -1419,7 +1475,7 @@ GEM sentry-sidekiq (5.8.0) sentry-ruby (~> 5.8.0) sidekiq (>= 3.0) - set (1.0.1) + set (1.0.2) sexp_processor (4.16.1) shellany (0.0.1) shoulda-matchers (5.1.0) @@ -1438,12 +1494,13 @@ GEM jwt (>= 1.5, < 3.0) multi_json (~> 1.10) simple_po_parser (1.1.6) - simplecov (0.21.2) + simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) - simplecov-cobertura (1.3.1) - simplecov (~> 0.8) + simplecov-cobertura (2.1.0) + rexml + simplecov (~> 0.19) simplecov-html (0.12.3) simplecov-lcov (0.8.0) simplecov_json_formatter (0.1.4) @@ -1522,7 +1579,7 @@ GEM unicode-display_width (>= 1.1.1, < 3) terser (1.0.2) execjs (>= 0.3.0, < 3) - test-prof (1.2.1) + test-prof (1.2.2) test_file_finder (0.1.4) faraday (~> 1.0) text (1.3.1) @@ -1530,7 +1587,6 @@ GEM thread_safe (0.3.6) thrift (0.16.0) tilt (2.0.11) - timeliness (0.3.10) timeout (0.3.2) timfel-krb5-auth (0.8.3) tins (1.31.1) @@ -1577,10 +1633,10 @@ GEM tzinfo (2.0.6) concurrent-ruby (~> 1.0) uber (0.1.0) - undercover (0.4.5) + undercover (0.4.6) imagen (>= 0.1.8) rainbow (>= 2.1, < 4.0) - rugged (>= 0.27, < 1.6) + rugged (>= 0.27, < 1.7) unf (0.1.4) unf_ext unf_ext (0.0.8.2) @@ -1654,7 +1710,7 @@ GEM nokogiri (~> 1.8) yajl-ruby (1.4.3) yard (0.9.26) - zeitwerk (2.6.6) + zeitwerk (2.6.7) PLATFORMS ruby @@ -1664,6 +1720,7 @@ DEPENDENCIES RedCloth (~> 4.3.2) acme-client (~> 2.0) activerecord-explain-analyze (~> 0.1) + activerecord-gitlab! acts-as-taggable-on (~> 9.0) addressable (~> 2.8) akismet (~> 3.0) @@ -1680,8 +1737,8 @@ DEPENDENCIES autoprefixer-rails (= 10.2.5.1) awesome_print aws-sdk-cloudformation (~> 1) - aws-sdk-core (~> 3.175.0) - aws-sdk-s3 (~> 1.126.0) + aws-sdk-core (~> 3.180.3) + aws-sdk-s3 (~> 1.132.1) axe-core-rspec babosa (~> 2.0) base32 (~> 0.3.0) @@ -1695,25 +1752,27 @@ DEPENDENCIES bullet (~> 7.0.2) bundler-audit (~> 0.7.0.1) bundler-checksum (~> 0.1.0)! - capybara (~> 3.39, >= 3.39.1) + capybara (~> 3.39, >= 3.39.2) capybara-screenshot (~> 1.0.26) carrierwave (~> 1.3) charlock_holmes (~> 0.7.7) circuitbox (= 2.0.0) + click_house-client! cloud_profiler_agent (~> 0.0.0)! - commonmarker (~> 0.23.9) + commonmarker (~> 0.23.10) concurrent-ruby (~> 1.1) connection_pool (~> 2.0) countries (~> 4.0.0) creole (~> 0.5.0) crystalball (~> 0.7.0) + csv_builder! cvss-suite (~> 3.0.1) database_cleaner (~> 1.7.0) deckar01-task_list (= 2.3.2) declarative_policy (~> 1.1.0) deprecation_toolkit (~> 1.5.1) derailed_benchmarks - devfile (~> 0.0.19.pre.alpha1) + devfile (~> 0.0.22.pre.alpha1) device_detector devise (~> 4.8.1) devise-pbkdf2-encryptable (~> 0.0.0)! @@ -1747,23 +1806,27 @@ DEPENDENCIES fugit (~> 1.8.1) fuubar (~> 2.2.0) gettext (~> 3.3) - gettext_i18n_rails (~> 1.8.0) + gettext_i18n_rails (~> 1.11.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 16.1.0.pre.rc2) + gitaly (~> 16.2.0.pre.rc4) gitlab-chronic (~> 0.10.5) - gitlab-dangerfiles (~> 3.10.0) + gitlab-dangerfiles (~> 3.13.0) gitlab-experiment (~> 0.7.1) - gitlab-fog-azure-rm (~> 1.7.0) - gitlab-labkit (~> 0.33.0) + gitlab-fog-azure-rm (~> 1.8.0) + gitlab-labkit (~> 0.34.0) gitlab-license (~> 2.3) gitlab-mail_room (~> 0.0.23) gitlab-markup (~> 1.9.0) gitlab-net-dns (~> 0.9.2) + gitlab-rspec! + gitlab-safe_request_store! + gitlab-schema-validation! gitlab-sidekiq-fetcher! - gitlab-styles (~> 10.0.0) + gitlab-styles (~> 10.1.0) + gitlab-utils! gitlab_chronic_duration (~> 0.10.6.2) gitlab_omniauth-ldap (~> 2.2.0) - gitlab_quality-test_tooling (~> 0.8.1) + gitlab_quality-test_tooling (~> 0.9.3) gon (~> 6.4.0) google-apis-androidpublisher_v3 (~> 0.34.0) google-apis-cloudbilling_v1 (~> 0.21.0) @@ -1776,9 +1839,9 @@ DEPENDENCIES google-apis-serviceusage_v1 (~> 0.28.0) google-apis-sqladmin_v1beta4 (~> 0.41.0) google-cloud-storage (~> 1.44.0) - google-protobuf (~> 3.23, >= 3.23.3) + google-protobuf (~> 3.23, >= 3.23.4) gpgme (~> 2.0.22) - grape (~> 1.7.0) + grape (~> 1.7.1) grape-entity (~> 0.10.0) grape-path-helpers (~> 1.7.1) grape-swagger (~> 1.6.1) @@ -1789,7 +1852,7 @@ DEPENDENCIES graphlyte (~> 1.0.0) graphql (~> 1.13.12) graphql-docs (~> 2.1.0) - grpc (~> 1.42.0) + grpc (~> 1.55.0) gssapi (~> 1.3.1) guard-rspec haml_lint (~> 0.40.0) @@ -1809,13 +1872,14 @@ DEPENDENCIES js_regex (~> 3.8) json (~> 2.6.3) json_schemer (~> 0.2.18) + jsonb_accessor (~> 1.3.10) jwt (~> 2.5) kaminari (~> 1.2.2) - kas-grpc (~> 0.1.0) + kas-grpc (~> 0.2.0) knapsack (~> 1.21.1) kramdown (~> 2.3.1) kubeclient (~> 4.11.0) - lefthook (~> 1.4.2) + lefthook (~> 1.4.7) letter_opener_web (~> 2.0.0) license_finder (~> 7.0) licensee (~> 9.15) @@ -1835,10 +1899,10 @@ DEPENDENCIES multi_json (~> 1.14.1) neighbor (~> 0.2.3) net-http (= 0.1.1) - net-ldap (~> 0.18.0) + net-ldap (~> 0.17.1) net-ntp net-protocol (~> 0.1.3) - nokogiri (~> 1.15, >= 1.15.2) + nokogiri (~> 1.15, >= 1.15.4) oauth2 (~> 2.0) octokit (~> 4.15) ohai (~> 17.9) @@ -1871,27 +1935,27 @@ DEPENDENCIES parslet (~> 1.8) peek (~> 1.1) pg (~> 1.5.3) - pg_query (~> 4.2.1) + pg_query (~> 4.2.3) png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) - prometheus-client-mmap (~> 0.25) + prometheus-client-mmap (~> 0.27) pry-byebug pry-rails (~> 0.3.9) - pry-shell (~> 0.6.1) + pry-shell (~> 0.6.4) puma (~> 6.3) - rack (~> 2.2.7) - rack-attack (~> 6.6.1) + rack (~> 2.2.8) + rack-attack (~> 6.7.0) rack-cors (~> 1.1.1) rack-oauth2 (~> 1.21.3) rack-proxy (~> 0.7.6) rack-timeout (~> 0.6.3) - rails (~> 6.1.7.2) + rails (~> 7.0.6) rails-controller-testing rails-i18n (~> 7.0) rainbow (~> 3.0) rbtrace (~> 0.4) rdoc (~> 6.3.2) - re2 (~> 1.6.0) + re2 (~> 1.7.0) recaptcha (~> 5.12) redis (~> 4.8.0) redis-actionpack (~> 5.3.0) @@ -1900,12 +1964,13 @@ DEPENDENCIES responders (~> 3.0) retriable (~> 3.1.2) rexml (~> 3.2.5) - rouge (~> 4.1.2) + rouge (~> 4.1.3) rqrcode-rails3 (~> 0.1.7) rspec-benchmark (~> 0.6.0) rspec-parameterized (~> 1.0) - rspec-rails (~> 6.0.1) + rspec-rails (~> 6.0.3) rspec-retry (~> 0.6.2) + rspec_flaky! rspec_junit_formatter rspec_profiling (~> 0.0.6) rubocop @@ -1916,12 +1981,12 @@ DEPENDENCIES ruby-saml (~> 1.15.0) ruby_parser (~> 3.20) rubyzip (~> 2.3.2) - rugged (~> 1.5) + rugged (~> 1.6) sanitize (~> 6.0) sassc-rails (~> 2.1.0) sd_notify (~> 0.1.0) seed-fu (~> 2.3.7) - selenium-webdriver (= 4.9.0) + selenium-webdriver (= 4.11.0) semver_dialects (~> 1.2.1) sentry-rails (~> 5.8.0) sentry-raven (~> 3.1) @@ -1933,7 +1998,7 @@ DEPENDENCIES sigdump (~> 0.2.4) simple_po_parser (~> 1.1.6) simplecov (~> 0.21) - simplecov-cobertura (~> 1.3.1) + simplecov-cobertura (~> 2.1.0) simplecov-lcov (~> 0.8.0) slack-messenger (~> 2.3.4) snowplow-tracker (~> 0.8.0) @@ -1950,7 +2015,7 @@ DEPENDENCIES tanuki_emoji (~> 0.6) telesignenterprise (~> 2.2) terser (= 1.0.2) - test-prof (~> 1.2.1) + test-prof (~> 1.2.2) test_file_finder (~> 0.1.3) thrift (>= 0.16.0) timfel-krb5-auth (~> 0.8) @@ -1973,4 +2038,4 @@ DEPENDENCIES yajl-ruby (~> 1.4.3) BUNDLED WITH - 2.4.14 + 2.4.18 diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 9c71ff591aad..80fa1d87025d 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -13,36 +13,36 @@ src: }; actioncable = { dependencies = ["actionpack" "activesupport" "nio4r" "websocket-driver"]; - groups = ["default" "development" "test"]; + groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y9lj7ra9xf4q4mryydmd498grsndqmz1zwasb4ai9gv62igvw3s"; + sha256 = "1d72cqx1h9c0yl1vc8xakvji00krg118ih6lwqlg5nbw50gbx25c"; type = "gem"; }; - version = "6.1.7.2"; + version = "7.0.6"; }; actionmailbox = { - dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; + dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" "net-imap" "net-pop" "net-smtp"]; groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bzacsr93sxv90nljv3ajw54nmyz1v9k2v2wx1pxsi0jasqg5fvn"; + sha256 = "12xkyfdpr7ljnd31yhc2kzl0rqrlwxzpg4qcn4yb2h364hwc6fh8"; type = "gem"; }; - version = "6.1.7.2"; + version = "7.0.6"; }; actionmailer = { - dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"]; + dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rjddp1a5l4amsbibhnf7g2rb69qvq0nc0a2dvr6r57bpkf82hj4"; + sha256 = "01x11ijfg56585vj7a7az0235idnxcnyjp1nb1jvkm08jjll5d1k"; type = "gem"; }; - version = "6.1.7.2"; + version = "7.0.6"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -50,32 +50,32 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c2y6sqpan68lrx78pvhbxb2917m75s808r6cg1kyygwvg31niza"; + sha256 = "0d66w1d9rhvafd0dilqyr1ymsvr060l8hi0xvwij7cyvzzxrlrbc"; type = "gem"; }; - version = "6.1.7.2"; + version = "7.0.6"; }; actiontext = { - dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"]; + dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "globalid" "nokogiri"]; groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jx8wi961i34v7x0j3h4wjw3qbyx9bkzb598vg42kidzk2f90dyj"; + sha256 = "0bpyfh8g0mzgkb8bxvf245mwnx1awbr1y6dxcdckyhsjjgrfynfl"; type = "gem"; }; - version = "6.1.7.2"; + version = "7.0.6"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; - groups = ["default" "development" "test"]; + groups = ["default" "development" "monorepo" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10g5gk8h4mfhvgqylzbf591fqf5p78ca35cb97p9bclpv9jfy0za"; + sha256 = "1icfh9pgjpd29apzn07cnqa9nlpvjv7i4vrygack5gp7hp54l8m7"; type = "gem"; }; - version = "6.1.7.2"; + version = "7.0.6"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -83,10 +83,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ililjwy4x52a6x5fidh1iyllf6vx49nz93fd2hxypc5bpryx9mz"; + sha256 = "1gawwb6550ra1xgbrki03aq4q5wafa3xfrpdr3cva4ghy3qqn53q"; type = "gem"; }; - version = "6.1.7.2"; + version = "7.0.6"; }; activemodel = { dependencies = ["activesupport"]; @@ -94,10 +94,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nn17y72fhsynwn11bqg75bazqp6r1g8mpwwyv64harwvh3fh5qj"; + sha256 = "072iv0d3vpbp0xijg4jj99sjil1rykmqfj9addxj76bm5mbzwcaj"; type = "gem"; }; - version = "6.1.7.2"; + version = "7.0.6"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -105,10 +105,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k69m3b0lb4jx20jx8vsvdqm1ki1r6riq9haabyddkcpvmgz1wh7"; + sha256 = "1l0rn43bhyzlfa4wwcfz016vb4lkzvl0jf5zibkjy4sppxxixzrq"; type = "gem"; }; - version = "6.1.7.2"; + version = "7.0.6"; }; activerecord-explain-analyze = { dependencies = ["activerecord" "pg"]; @@ -121,27 +121,37 @@ src: }; version = "0.1.0"; }; + activerecord-gitlab = { + dependencies = ["activerecord"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/gems/activerecord-gitlab"; + type = "path"; + }; + version = "0.2.0"; + }; activestorage = { dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"]; groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c3cvc01azfkccg5hsl96wafsxb5hf1nva3cn8rif2mlwx17p8n3"; + sha256 = "036mv935r5mmh7fljz10lyr43c5y5bn8b6h7gdkv8spfgwzihw4j"; type = "gem"; }; - version = "6.1.7.2"; + version = "7.0.6"; }; activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; - groups = ["default" "development" "test"]; + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + groups = ["default" "development" "monorepo" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14pjq2k761qaywaznpqq8ziivjk2ks1ma2cjwdflkxqgndxjmsr2"; + sha256 = "1cjsf26656996hv48wgv2mkwxf0fy1qc68ikgzq7mzfq2mmvmayk"; type = "gem"; }; - version = "6.1.7.2"; + version = "7.0.6"; }; acts-as-taggable-on = { dependencies = ["activerecord"]; @@ -149,10 +159,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11hv6pdsr0kd9bmd84sab21sbm209ck1cwqs5jqbf9g1xbh9nh2s"; + sha256 = "1nhyvfdiv6mz8z3icwhk01482hq0s6dvf1qysvh27cyi3c4y1n53"; type = "gem"; }; - version = "9.0.0"; + version = "9.0.1"; }; addressable = { dependencies = ["public_suffix"]; @@ -401,10 +411,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fbbzcszpdjy2yzxfvl5fzgn0jgznkwxvqpb46nxv69gqhv3dpsg"; + sha256 = "0lc3j74v49b2akyimfnsx3vsgi1i3068cpchn358l0dv27aib6c2"; type = "gem"; }; - version = "3.175.0"; + version = "3.180.3"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -423,10 +433,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17ya49rwjzimqhzsj6vlc4xfvj2sixy04kr4b6ddg3r6y0jrsixi"; + sha256 = "0iciakii0vcm16x0fivs5hwwhy3n8j1f9d7pimxr05yplnxizh6a"; type = "gem"; }; - version = "1.126.0"; + version = "1.132.1"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -434,10 +444,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d4bifmll4hrf4gihr5hdvn59wjpz4qpyg5jj95kp17fykzqg36n"; + sha256 = "0z889c4c1w7wsjm3szg64ay5j51kjl4pdf94nlr1yks2rlanm7na"; type = "gem"; }; - version = "1.5.1"; + version = "1.6.0"; }; axe-core-api = { dependencies = ["dumb_delegator" "virtus"]; @@ -539,10 +549,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02r1c3isfchs5fxivbq99gc3aq4vfyn8snhcy707dal1p8qz12qb"; + sha256 = "048z3fvcknqx7ikkhrcrykxlqmf9bzc7l0y5h1cnvrc9n2qf0k8m"; type = "gem"; }; - version = "3.1.16"; + version = "3.1.18"; }; benchmark = { groups = ["default" "development"]; @@ -720,10 +730,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qhg45jxxy5h90frmajrrh5sirmj29sbfhbf7q0qhjymc0w1p0r5"; + sha256 = "114qm5f5vhwaaw9rj1h2lcamh46zl13v1m18jiw68zl961gwmw6n"; type = "gem"; }; - version = "3.39.1"; + version = "3.39.2"; }; capybara-screenshot = { dependencies = ["capybara" "launchy"]; @@ -861,6 +871,16 @@ src: }; version = "0.9.2"; }; + click_house-client = { + dependencies = ["activesupport" "addressable" "json"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/gems/click_house-client"; + type = "path"; + }; + version = "0.1.0"; + }; cloud_profiler_agent = { dependencies = ["google-cloud-profiler-v2" "google-protobuf" "googleauth" "stackprof"]; groups = ["default"]; @@ -911,10 +931,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "074162raa8pc92q6833hgqdlfr3z5jgid9avdz5k25cnls2rqwrf"; + sha256 = "1lb5slzbqrca49h0gaifg82xky5r7i9xgm4560pin1xl5fp15lzx"; type = "gem"; }; - version = "0.23.9"; + version = "0.23.10"; }; concurrent-ruby = { groups = ["default" "development" "test"]; @@ -1022,6 +1042,15 @@ src: }; version = "1.14.0"; }; + csv_builder = { + groups = ["default"]; + platforms = []; + source = { + path = "${src}/gems/csv_builder"; + type = "path"; + }; + version = "0.1.0"; + }; cvss-suite = { groups = ["default"]; platforms = []; @@ -1163,10 +1192,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n4yxjijplg0klcnjdhk7kxmvlb0szchk1ad8flg5hb2j59c8a6r"; + sha256 = "0hglq61xxs8hgj2aq6g94w9ry90jq9aivb3c6fycxz1srdq26lsl"; type = "gem"; }; - version = "0.0.19.pre.alpha1"; + version = "0.0.22.pre.alpha1"; }; device_detector = { groups = ["default"]; @@ -1499,7 +1528,7 @@ src: groups = ["default"]; platforms = []; source = { - path = "${src}/vendor/gems/error_tracking_open_api"; + path = "${src}/gems/error_tracking_open_api"; type = "path"; }; version = "1.0.0"; @@ -1631,17 +1660,6 @@ src: }; version = "1.10.0"; }; - faraday-cookie_jar = { - dependencies = ["faraday" "http-cookie"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "00hligx26w9wdnpgsrf0qdnqld4rdccy8ym6027h5m735mpvxjzk"; - type = "gem"; - }; - version = "0.0.7"; - }; faraday-em_http = { groups = ["danger" "default" "development" "test"]; platforms = []; @@ -1844,10 +1862,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pfmn0gprc3c15baxa9rx64pqllk64m60f5vg4gp0icpafkp0jx5"; + sha256 = "0dj3y95260rvlclkkcxak6c1dsrzbyr4wik7jv3y949r4w9adfk9"; type = "gem"; }; - version = "2.3.4"; + version = "2.6.0"; }; filelock = { groups = ["default" "development" "test"]; @@ -2069,10 +2087,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vs918a03mqvx9aczaqdg9d2q9s3c6swqavzn82qgq5i822czrcm"; + sha256 = "1gibn9j4k9ck54v7rxbqwa587fc2l92clv9r71zhyl3c4m57x771"; type = "gem"; }; - version = "1.8.0"; + version = "1.11.0"; }; gettext_i18n_rails_js = { dependencies = ["gettext" "gettext_i18n_rails" "po_to_json" "rails"]; @@ -2102,10 +2120,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bz3i05lr1nzm35xg11blaq78v96sg49aw1yh4hj7wfk3cbdn1q0"; + sha256 = "0z2ilb738q3fbk91yzgz1z2y1ws80v17glxvh7abfdqmzdi6cx88"; type = "gem"; }; - version = "16.1.0.pre.rc2"; + version = "16.2.0.pre.rc4"; }; gitlab = { dependencies = ["httparty" "terminal-table"]; @@ -2135,10 +2153,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ha0n6wkw8xm42v4wx9815ivpwjydp88jv9laq19qljj3w2zwk6z"; + sha256 = "1bd17qkjskzcrm406iz1a06s6hy1sy61xv7bz0kq8lqzzv3ym090"; type = "gem"; }; - version = "3.10.0"; + version = "3.13.0"; }; gitlab-experiment = { dependencies = ["activesupport" "request_store"]; @@ -2152,15 +2170,15 @@ src: version = "0.7.1"; }; gitlab-fog-azure-rm = { - dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types" "ms_rest_azure"]; + dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hix4q2ibrq0r97bn492vzxj4fgijc209kbak8jlrbal7ja6g74n"; + sha256 = "0a3c3slg1iqlhyci9mnbasgw1qcsnznczyqjkn28hfr79cblpwp4"; type = "gem"; }; - version = "1.7.0"; + version = "1.8.0"; }; gitlab-labkit = { dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"]; @@ -2168,10 +2186,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nz0g5s65wkicsn9ianqxi7ys2w666n226gfblzllcfy1z9siyyi"; + sha256 = "1k9yd8b1xbq3l6l1n4pb0mh2wklz0ninr7h2l5xx031r05150p6a"; type = "gem"; }; - version = "0.33.0"; + version = "0.34.0"; }; gitlab-license = { groups = ["default"]; @@ -2214,6 +2232,36 @@ src: }; version = "0.9.2"; }; + gitlab-rspec = { + dependencies = ["activesupport" "rspec"]; + groups = ["development" "monorepo" "test"]; + platforms = []; + source = { + path = "${src}/gems/gitlab-rspec"; + type = "path"; + }; + version = "0.1.0"; + }; + gitlab-safe_request_store = { + dependencies = ["request_store"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/gems/gitlab-safe_request_store"; + type = "path"; + }; + version = "0.1.0"; + }; + gitlab-schema-validation = { + dependencies = ["diffy" "pg_query"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/gems/gitlab-schema-validation"; + type = "path"; + }; + version = "0.1.0"; + }; gitlab-sidekiq-fetcher = { dependencies = ["json" "sidekiq"]; groups = ["default"]; @@ -2230,10 +2278,20 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w0kd66l92ckv5z3gqfifhkny8ipxx4cckpdyign0lgknpvj06wa"; + sha256 = "0jn8zp5a35yi6jw7kyyq8fgpzcwmr5bfpl7j9ki2y13x77sla9zl"; type = "gem"; }; - version = "10.0.0"; + version = "10.1.0"; + }; + gitlab-utils = { + dependencies = ["actionview" "activesupport" "addressable" "nokogiri" "rake"]; + groups = ["monorepo"]; + platforms = []; + source = { + path = "${src}/gems/gitlab-utils"; + type = "path"; + }; + version = "0.1.0"; }; gitlab_chronic_duration = { dependencies = ["numerizer"]; @@ -2263,10 +2321,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02xwchhhfv8jkypap5pn1wjkdx92jxk4wsp71i2s0ymnqw98y401"; + sha256 = "1w408mlqkf430bm7g1slp7l5crwvvqbmbynhidc9jx3i9d8g6lcp"; type = "gem"; }; - version = "0.8.1"; + version = "0.9.3"; }; globalid = { dependencies = ["activesupport"]; @@ -2514,10 +2572,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1aczvz5jdslr1bfx08xrycp6ggdpaifdlh5hrdyd774mvcl0mg2d"; + sha256 = "1dq5lgkxhagqr8zjrwr10zi8rldbg2vhis2m5q86v5q9415ylfgj"; type = "gem"; }; - version = "3.23.3"; + version = "3.23.4"; }; googleapis-common-protos = { dependencies = ["google-protobuf" "googleapis-common-protos-types" "grpc"]; @@ -2569,10 +2627,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lbgysx2d64hsck11jajc4gwikj5nd82809bz0jibrnp4yb1lcw8"; + sha256 = "1dnbb3gxwbmvhzvzb22prwaim9wmvilm0nm91ndw2ggf324rsrvb"; type = "gem"; }; - version = "1.7.0"; + version = "1.7.1"; }; grape-entity = { dependencies = ["activesupport" "multi_json"]; @@ -2699,10 +2757,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jjq2ing7px4zvdrg9xcq5a9qsciq6g3v14n95a3d9n6cyg69lmk"; + sha256 = "1bk1l7mi98givcd4rj0h9izj97nwgff4lp7xi89mp3z9wpw354sj"; type = "gem"; }; - version = "1.42.0"; + version = "1.55.0"; }; gssapi = { dependencies = ["ffi"]; @@ -3046,7 +3104,7 @@ src: groups = ["default"]; platforms = []; source = { - path = "${src}/vendor/gems/ipynbdiff"; + path = "${src}/gems/ipynbdiff"; type = "path"; }; version = "0.4.7"; @@ -3136,6 +3194,17 @@ src: }; version = "0.2.18"; }; + jsonb_accessor = { + dependencies = ["activerecord" "activesupport" "pg"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1q2q9i2kf4p6vw8fbzvsd037wl837gpsiiikjazf6fdfayi803v7"; + type = "gem"; + }; + version = "1.3.10"; + }; jsonpath = { dependencies = ["multi_json"]; groups = ["default"]; @@ -3206,10 +3275,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nhdllr7zi19b73q0flbc0lhqb5mn0jrw4bqdang7wfxgfdwf6dj"; + sha256 = "07lsr5gfnl56v8znf780vpa79wx3p5rqsdgc6j88364ixj3zg8xr"; type = "gem"; }; - version = "0.1.0"; + version = "0.2.0"; }; knapsack = { dependencies = ["rake"]; @@ -3271,10 +3340,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hqffqr2krk6gcjapriwwmdrjz56dczshxafnwrkipyxi51vwgvh"; + sha256 = "112m3ypr3z3n23l0axy057wkbzwhf52p20pya2nylwd8jmck1gi2"; type = "gem"; }; - version = "1.4.2"; + version = "1.4.7"; }; letter_opener = { dependencies = ["launchy"]; @@ -3634,28 +3703,6 @@ src: }; version = "3.2.5"; }; - ms_rest = { - dependencies = ["concurrent-ruby" "faraday" "timeliness"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1jiha1bda5knpjqjymwik6i41n69gb0phcrgvmgc5icl4mcisai7"; - type = "gem"; - }; - version = "0.7.6"; - }; - ms_rest_azure = { - dependencies = ["concurrent-ruby" "faraday" "faraday-cookie_jar" "ms_rest"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "06i37b84r2q206kfm5vsi9s1qiiy09091vhvc5pzb7320h0hc1ih"; - type = "gem"; - }; - version = "0.12.0"; - }; msgpack = { groups = ["default"]; platforms = []; @@ -3797,10 +3844,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xqcffn3c1564c4fizp10dzw2v5g2pabdzrcn25hq05bqhsckbar"; + sha256 = "1ycw0qsw3hap8svakl0i30jkj0ffd4lpyrn17a1j0w8mz5ainmsj"; type = "gem"; }; - version = "0.18.0"; + version = "0.17.1"; }; net-ntp = { groups = ["default"]; @@ -3898,14 +3945,14 @@ src: }; nokogiri = { dependencies = ["mini_portile2" "racc"]; - groups = ["default" "development" "test"]; + groups = ["default" "development" "monorepo" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mr2ibfk874ncv0qbdkynay738w2mfinlkhnbd5lyk5yiw5q1p10"; + sha256 = "0k9w2z0953mnjrsji74cshqqp08q7m1r6zhadw1w0g34xzjh3a74"; type = "gem"; }; - version = "1.15.2"; + version = "1.15.4"; }; notiffany = { dependencies = ["nenv" "shellany"]; @@ -4403,10 +4450,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cs8c0f903phs3yjjbrhlyaipvmvm95xids06a761hf0s6lj0j5h"; + sha256 = "15ynrzqsmmbmxib8ri8n9k6z3l6rwd91j7y1mghm33nfgdf9bj8w"; type = "gem"; }; - version = "4.2.1"; + version = "4.2.3"; }; plist = { groups = ["default"]; @@ -4478,10 +4525,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14m09ysq0l6kih9pdy1mmdabdyjk09hvx4rzqh6phgb34s1w4pfp"; + sha256 = "0rvh5xmvhzdm74g4n93ny3kg1xb4dki6l194xjrh1yp8aaimfvvi"; type = "gem"; }; - version = "0.25.0"; + version = "0.27.0"; }; pry = { dependencies = ["coderay" "method_source"]; @@ -4522,10 +4569,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "031nacdzds5821p384qzhliim1h6d60nc63ml572gpz4zwynp6m9"; + sha256 = "027jd53zjbimqb3n1329q4njs94bagmfnrfylxqv04lrsa14h0md"; type = "gem"; }; - version = "0.6.1"; + version = "0.6.4"; }; public_suffix = { groups = ["danger" "default" "development" "test"]; @@ -4583,10 +4630,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16w217k9z02c4hqizym8dkj6bqmmzx4qdvqpnskgzf174a5pwdxk"; + sha256 = "15rdwbyk71c9nxvd527bvb8jxkcys8r3dj3vqra5b3sa63qs30vv"; type = "gem"; }; - version = "2.2.7"; + version = "2.2.8"; }; rack-accept = { dependencies = ["rack"]; @@ -4605,10 +4652,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "049s3y3dpl6dn478g912y6f9nzclnnkl30psrbc2w5kaihj5szhq"; + sha256 = "0z6pj5vjgl6swq7a33gssf795k958mss8gpmdb4v4cydcs7px91w"; type = "gem"; }; - version = "6.6.1"; + version = "6.7.0"; }; rack-cors = { dependencies = ["rack"]; @@ -4660,10 +4707,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rjl709krgf499dhjdapg580l2qaj9d91pwzk8ck8fpnazlx1bdd"; + sha256 = "1ysx29gk9k14a14zsp5a8czys140wacvp91fja8xcja0j1hzqq8c"; type = "gem"; }; - version = "2.0.2"; + version = "2.1.0"; }; rack-timeout = { groups = ["default"]; @@ -4676,15 +4723,15 @@ src: version = "0.6.3"; }; rails = { - dependencies = ["actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; + dependencies = ["actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties"]; groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b7ggchi3d7pwzmj8jn9fhbazr5fr4dy304f0hz7kqbg23s9c1ym"; + sha256 = "08glp6jhq5yh8i5jjxzqa3aqx819l6ci6m68bx1asmimla0x9ysx"; type = "gem"; }; - version = "6.1.7.2"; + version = "7.0.6"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -4731,15 +4778,15 @@ src: version = "7.0.3"; }; railties = { - dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; + dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor" "zeitwerk"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mm3nf3y715ln6v8k6g4351ggkr1bcwc5637vr979yw8vsmdi42k"; + sha256 = "0dcabk5bl5flmspnb9d2qcvclcaw0nd5yr9w6m5pzsmylg3y63pv"; type = "gem"; }; - version = "6.1.7.2"; + version = "7.0.6"; }; rainbow = { groups = ["coverage" "default" "development" "test"]; @@ -4838,10 +4885,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1habsrf67d3m5p12wc2bydsa7bj87r7w1266x8in59znf5wz4drf"; + sha256 = "00yryimbkm1k85n99f81n7cripkmh14459c9pmb7prl9nbiikkqc"; type = "gem"; }; - version = "1.6.0"; + version = "1.7.0"; }; recaptcha = { dependencies = ["json"]; @@ -4986,10 +5033,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p7pqcfq33q1z4xlp4qm94w4h3fzc1yvr3cny16d00i8b20v4rx2"; + sha256 = "14kjykc6rpdh24sshg9savqdajya2dislc1jmbzg91w9967f4gv1"; type = "gem"; }; - version = "3.0.0"; + version = "3.0.1"; }; rest-client = { dependencies = ["http-accept" "http-cookie" "mime-types" "netrc"]; @@ -5058,10 +5105,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pym2zjwl6dwdfvbn7rbvmds32r70jx9qddhvvi6pqy6987ack1v"; + sha256 = "19drl3x8fw65v3mpy7fk3cf3dfrywz5alv98n2rm4pp04vdn71lw"; type = "gem"; }; - version = "4.1.2"; + version = "4.1.3"; }; rqrcode = { dependencies = ["chunky_png"]; @@ -5109,36 +5156,36 @@ src: }; rspec-core = { dependencies = ["rspec-support"]; - groups = ["default" "development" "test"]; + groups = ["default" "development" "monorepo" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ibb81slc35q5yp276sixp3yrvj9q92wlmi1glbnwlk6g49z8rn4"; + sha256 = "0l95bnjxdabrn79hwdhn2q1n7mn26pj7y1w5660v5qi81x458nqm"; type = "gem"; }; - version = "3.12.0"; + version = "3.12.2"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; - groups = ["default" "development" "test"]; + groups = ["default" "development" "monorepo" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03ba3lfdsj9zl00v1yvwgcx87lbadf87livlfa5kgqssn9qdnll6"; + sha256 = "05j44jfqlv7j2rpxb5vqzf9hfv7w8ba46wwgxwcwd8p0wzi1hg89"; type = "gem"; }; - version = "3.12.2"; + version = "3.12.3"; }; rspec-mocks = { dependencies = ["diff-lcs" "rspec-support"]; - groups = ["default" "development" "test"]; + groups = ["default" "development" "monorepo" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sq2cc9pm5gq411y7iwfvzbmgv3g91lyf7y7cqn1lr3yf1v122nc"; + sha256 = "1gq7gviwpck7fhp4y5ibljljvxgjklza18j62qf6zkm2icaa8lfy"; type = "gem"; }; - version = "3.12.3"; + version = "3.12.6"; }; rspec-parameterized = { dependencies = ["rspec-parameterized-core" "rspec-parameterized-table_syntax"]; @@ -5179,10 +5226,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d3fnabkaw8n0na2dpnlg2xygggj51djzpj9x6y5rkiqbfyqwv01"; + sha256 = "086qdyz7c4s5dslm6j06mq7j4jmj958whc3yinhabnqqmz7i463d"; type = "gem"; }; - version = "6.0.1"; + version = "6.0.3"; }; rspec-retry = { dependencies = ["rspec-core"]; @@ -5205,6 +5252,16 @@ src: }; version = "3.12.0"; }; + rspec_flaky = { + dependencies = ["activesupport" "rspec"]; + groups = ["development" "monorepo" "test"]; + platforms = []; + source = { + path = "${src}/gems/rspec_flaky"; + type = "path"; + }; + version = "0.1.0"; + }; rspec_junit_formatter = { dependencies = ["rspec-core"]; groups = ["test"]; @@ -5233,10 +5290,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1imdfx3mx2p1k7bhc5qm35zvqw12hyz52yy2k9xj3dwrdpzjg0fh"; + sha256 = "0l46lw5gfj3mcm982wpmx7br4rs466gyislv0hfwcsk8dxhv1zkw"; type = "gem"; }; - version = "1.43.0"; + version = "1.50.2"; }; rubocop-ast = { dependencies = ["parser"]; @@ -5244,10 +5301,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pdzabz95hv3z5sfbkfqa8bdybsfl13gv7rjb32v3ss8klq99lbd"; + sha256 = "188bs225kkhrb17dsf3likdahs2p1i1sqn0pr3pvlx50g6r2mnni"; type = "gem"; }; - version = "1.24.1"; + version = "1.29.0"; }; rubocop-capybara = { dependencies = ["rubocop"]; @@ -5255,10 +5312,21 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h4qcjkz0365qlhi7y1ni94qj14k397cad566zygm20p15ypbp5v"; + sha256 = "01fn05a87g009ch1sh00abdmgjab87i995msap26vxq1a5smdck6"; type = "gem"; }; - version = "2.17.0"; + version = "2.18.0"; + }; + rubocop-factory_bot = { + dependencies = ["rubocop"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kqchl8f67k2g56sq2h1sm2wb6br5gi47s877hlz94g5086f77n1"; + type = "gem"; + }; + version = "2.23.1"; }; rubocop-graphql = { dependencies = ["rubocop"]; @@ -5277,10 +5345,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n7g0vg06ldjaq4f8c11c7yqy99zng1qdrkkk4kfziippy24yxnc"; + sha256 = "0bp02784v0qm8qcswi169s0ar6216rwk516v3idzpbxznpqp97ac"; type = "gem"; }; - version = "1.16.0"; + version = "1.18.0"; }; rubocop-rails = { dependencies = ["activesupport" "rack" "rubocop"]; @@ -5288,21 +5356,21 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nxyifly45y7dfiaf0ql8aq7xykrg0sh1l7dxmn3sb9p2jd18140"; + sha256 = "05r46ds0dm44fb4p67hbz721zck8mdwblzssz2y25yh075hvs36j"; type = "gem"; }; - version = "2.17.4"; + version = "2.20.2"; }; rubocop-rspec = { - dependencies = ["rubocop" "rubocop-capybara"]; + dependencies = ["rubocop" "rubocop-capybara" "rubocop-factory_bot"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vmmin3ymgq7bhv2hl4pd0zpwawy709p816axc4vi67w61b4bij1"; + sha256 = "00rsflhijcr0q838fgbdmk7knm5kcjpimn6x0k9qmiw15hi96x1d"; type = "gem"; }; - version = "2.18.1"; + version = "2.22.0"; }; ruby-fogbugz = { dependencies = ["crack" "multipart-post"]; @@ -5424,10 +5492,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wnfgxx59nq2wpvi8ll7bqw9x99x5hps6i38xdjrwbb5a3896d58"; + sha256 = "016bawsahkhxx7p8azxirpl7y2y7i8a027pj8910gwf6ipg329in"; type = "gem"; }; - version = "1.5.1"; + version = "1.6.3"; }; safe_yaml = { groups = ["default" "test"]; @@ -5543,10 +5611,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kxnv3ywssagv2q453hasrrrvsv68d5f3ccm33pyacdji88w8pqg"; + sha256 = "0ws0mh230l1pvyxcrlcr48w01alfhprjs1jbd8yrn463drsr2yac"; type = "gem"; }; - version = "4.9.0"; + version = "4.11.0"; }; semver_dialects = { dependencies = ["pastel" "thor" "tty-command"]; @@ -5608,10 +5676,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p8raic4vlif3r4crjm3x32hmkpikjd456c126hrv3kkyj6zwsfi"; + sha256 = "00ick64s6066idlylbxhpjmxf56h1l22c8xp0mg4j8963zga9zq2"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.2"; }; sexp_processor = { groups = ["default"]; @@ -5703,21 +5771,21 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hrv046jll6ad1s964gsmcq4hvkr3zzr6jc7z1mns22mvfpbc3cr"; + sha256 = "198kcbrjxhhzca19yrdcd6jjj9sb51aaic3b0sc3pwjghg3j49py"; type = "gem"; }; - version = "0.21.2"; + version = "0.22.0"; }; simplecov-cobertura = { - dependencies = ["simplecov"]; - groups = ["development" "test"]; + dependencies = ["rexml" "simplecov"]; + groups = ["coverage" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07ikl2y382g6ibzfflsamh13qlsr2769bx09kxdcs894cl882wwv"; + sha256 = "00izmp202y48qvmvwrh5x56cc5ivbjhgkkkjklvqmqzj9pik4r9c"; type = "gem"; }; - version = "1.3.1"; + version = "2.1.0"; }; simplecov-html = { groups = ["coverage" "default" "development" "test"]; @@ -6102,10 +6170,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09phq7jxfgamv03kjcgibw0f6w3g3mlb9yapji3bxh7cbjvwk2pa"; + sha256 = "08j5456rdpgxvv8bs44x81jrxzpxb79wxfxdq4fqwxyircxzi2jj"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; test_file_finder = { dependencies = ["faraday"]; @@ -6168,16 +6236,6 @@ src: }; version = "2.0.11"; }; - timeliness = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0gvp9b7yn4pykn794cibylc9ys1lw7fzv7djx1433icxw4y26my3"; - type = "gem"; - }; - version = "0.3.10"; - }; timeout = { groups = ["default"]; platforms = []; @@ -6385,10 +6443,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fgkhqg7npixc95h060ykbjz0a07ldl3dp9y7wd2qgi5irq5vfr7"; + sha256 = "1bp644b1mxwhbkjlm8bmwv8sxkkwkpc7chqxff9a8yxy0n99ambj"; type = "gem"; }; - version = "0.4.5"; + version = "0.4.6"; }; unf = { dependencies = ["unf_ext"]; @@ -6762,9 +6820,9 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09pqhdi6q4sqv0p1gnjpbcy4az0yv8hrpykjngdgh9qiqd87nfdv"; + sha256 = "028ld9qmgdllxrl7d0qkl65s58wb1n3gv8yjs28g43a8b1hplxk1"; type = "gem"; }; - version = "2.6.6"; + version = "2.6.7"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/update.py b/nixpkgs/pkgs/applications/version-management/gitlab/update.py index 3df024b2c043..195fce350c28 100755 --- a/nixpkgs/pkgs/applications/version-management/gitlab/update.py +++ b/nixpkgs/pkgs/applications/version-management/gitlab/update.py @@ -187,7 +187,7 @@ def update_rubyenv(): ) # Fetch vendored dependencies temporarily in order to build the gemset.nix - subprocess.check_output(["mkdir", "-p", "vendor/gems"], cwd=rubyenv_dir) + subprocess.check_output(["mkdir", "-p", "vendor/gems", "gems"], cwd=rubyenv_dir) subprocess.check_output( [ "sh", @@ -196,6 +196,14 @@ def update_rubyenv(): ], cwd=f"{rubyenv_dir}/vendor/gems", ) + subprocess.check_output( + [ + "sh", + "-c", + f"curl -L https://gitlab.com/gitlab-org/gitlab/-/archive/v{version}-ee/gitlab-v{version}-ee.tar.bz2?path=gems | tar -xj --strip-components=3", + ], + cwd=f"{rubyenv_dir}/gems", + ) # Undo our gemset.nix patches so that bundix runs through subprocess.check_output( @@ -213,11 +221,13 @@ def update_rubyenv(): "1i\\src:", "-e", 's:path = \\(vendor/[^;]*\\);:path = "${src}/\\1";:g', + "-e", + 's:path = \\(gems/[^;]*\\);:path = "${src}/\\1";:g', "gemset.nix", ], cwd=rubyenv_dir, ) - subprocess.check_output(["rm", "-rf", "vendor"], cwd=rubyenv_dir) + subprocess.check_output(["rm", "-rf", "vendor", "gems"], cwd=rubyenv_dir) @cli.command("update-gitaly") |