diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 6a9707dd4110..7547a779cfb4 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,28 +1,14 @@ { - "version": "15.6.2", - "repo_hash": "sha256-WMDst9BHjqK5UIYKzqJJnhrLPHxV0PmW+r8FGBueBs8=", - "yarn_hash": "0lgl8rs9mlrwpzq75rywdbjbiib17wxvzlv1jibnx66iw1ym2rvh", + "version": "15.7.2", + "repo_hash": "sha256-XfGQkbJs9AyU+aljfcE1Di8d9zQ6CoTo9I1INE2+4/U=", + "yarn_hash": "086v3lr4hnz8z8pla1d3mi2smldidmx2z2cmffn830ianpqkk83l", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v15.6.2-ee", + "rev": "v15.7.2-ee", "passthru": { - "GITALY_SERVER_VERSION": "15.6.2", - "GITLAB_PAGES_VERSION": "1.63.0", - "GITLAB_SHELL_VERSION": "14.13.0", - "GITLAB_WORKHORSE_VERSION": "15.6.2" - }, - "vendored_gems": [ - "bundler-checksum", - "devise-pbkdf2-encryptable", - "omniauth-azure-oauth2", - "omniauth-cas3", - "omniauth-gitlab", - "omniauth_crowd", - "omniauth-salesforce", - "attr_encrypted", - "mail-smtp_pool", - "microsoft_graph_mailer", - "ipynbdiff", - "error_tracking_open_api" - ] + "GITALY_SERVER_VERSION": "15.7.2", + "GITLAB_PAGES_VERSION": "15.7.2", + "GITLAB_SHELL_VERSION": "14.14.0", + "GITLAB_WORKHORSE_VERSION": "15.7.2" + } } diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 2ed65c59901b..e6cd605a51ea 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, fetchpatch, fetchFromGitLab, bundlerEnv , ruby, tzdata, git, nettools, nixosTests, nodejs, openssl , gitlabEnterprise ? false, callPackage, yarn -, fixup_yarn_lock, replace, file, cacert, fetchYarnDeps, makeWrapper +, fixup_yarn_lock, replace, file, cacert, fetchYarnDeps, makeWrapper, pkg-config }: let @@ -20,8 +20,11 @@ let inherit ruby; gemdir = ./rubyEnv; gemset = - let x = import (gemdir + "/gemset.nix"); + let x = import (gemdir + "/gemset.nix") src; in x // { + gpgme = x.gpgme // { + nativeBuildInputs = [ pkg-config ]; + }; # the openssl needs the openssl include files openssl = x.openssl // { buildInputs = [ openssl ]; @@ -47,7 +50,7 @@ let # `console` executable. ignoreCollisions = true; - extraConfigPaths = lib.forEach data.vendored_gems (gem: "${src}/vendor/gems/${gem}"); + extraConfigPaths = [ "${src}/vendor" ]; }; assets = stdenv.mkDerivation { @@ -99,6 +102,7 @@ let yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive patchShebangs node_modules/ + patchShebangs scripts/frontend/ runHook postConfigure ''; diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile index 5c9feca5cebc..9c561119f118 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -1,7 +1,6 @@ source 'https://rubygems.org' gem 'rugged', '~> 1.2' -gem 'github-linguist', '~> 7.20.0', require: 'linguist' gem 'gitlab-markup', '~> 1.7.1' gem 'activesupport', '~> 6.1.6.1' gem 'grpc', '~> 1.42.0' # keep in lock-step with grpc-tools @@ -13,13 +12,13 @@ gem 'rbtrace', require: false gem 'gitaly', '~> 15.5.0' # Labkit provides observability functionality -gem 'gitlab-labkit', '~> 0.28' +gem 'gitlab-labkit', '~> 0.29' # Detects the open source license the repository includes # This version needs to be in sync with GitLab CE/EE gem 'licensee', '~> 9.15' -gem 'google-protobuf', '~> 3.21.9' +gem 'google-protobuf', '~> 3.21.12' # Rails is currently blocked on the upgrade to the new major version for Redis, # so we don't upgrade either until the issue is resolved. This is an indirect diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index 85f0f5c03d14..da95241d34c4 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -29,7 +29,6 @@ GEM ast (2.4.2) binding_ninja (0.2.3) builder (3.2.4) - charlock_holmes (0.7.7) coderay (1.1.2) concord (0.1.5) adamantium (~> 0.2.0) @@ -40,7 +39,6 @@ GEM dotenv (2.7.6) equalizer (0.0.11) erubi (1.11.0) - escape_utils (1.2.2) factory_bot (5.0.2) activesupport (>= 4.2.0) faraday (1.0.1) @@ -48,12 +46,7 @@ GEM ffi (1.15.5) gitaly (15.5.0) grpc (~> 1.0) - github-linguist (7.20.0) - charlock_holmes (~> 0.7.7) - escape_utils (~> 1.2.0) - mini_mime (~> 1.0) - rugged (~> 1.0) - gitlab-labkit (0.28.0) + gitlab-labkit (0.29.0) actionpack (>= 5.0.0, < 8.0.0) activesupport (>= 5.0.0, < 8.0.0) grpc (>= 1.37) @@ -69,7 +62,7 @@ GEM with_env (= 1.1.0) xml-simple (~> 1.1.5) gitlab-markup (1.7.1) - google-protobuf (3.21.9) + google-protobuf (3.21.12) googleapis-common-protos-types (1.4.0) google-protobuf (~> 3.14) grpc (1.42.0) @@ -93,7 +86,6 @@ GEM memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) method_source (0.9.2) - mini_mime (1.1.2) mini_portile2 (2.8.0) minitest (5.16.3) msgpack (1.3.3) @@ -205,11 +197,10 @@ DEPENDENCIES activesupport (~> 6.1.6.1) factory_bot gitaly (~> 15.5.0) - github-linguist (~> 7.20.0) - gitlab-labkit (~> 0.28) + gitlab-labkit (~> 0.29) gitlab-license_finder gitlab-markup (~> 1.7.1) - google-protobuf (~> 3.21.9) + google-protobuf (~> 3.21.12) grpc (~> 1.42.0) licensee (~> 9.15) pry (~> 0.12.2) @@ -223,4 +214,4 @@ DEPENDENCIES timecop BUNDLED WITH - 2.3.24 + 2.3.26 diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 5f47a29cf1e5..778c206dedf8 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -11,7 +11,7 @@ let gemdir = ./.; }; - version = "15.6.2"; + version = "15.7.2"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -22,10 +22,10 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-or5Z96BCLFUC4r9bAZf9ytUOt4WozqwwuWGFuX2ix9k="; + sha256 = "sha256-IROyq3YVMFzykWluGl3et3hf7L0IfhGrn3zLR1j1hto="; }; - vendorSha256 = "sha256-SEPfso27PHHpvnQwdeMQYECw/CZIa/NdpMBSTRJEwIo="; + vendorSha256 = "sha256-UEEM0mv7d0gmDcsSKbeh4JcTnX4f5oogZnhRpqaNxwY="; ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ]; diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index a36e88e08668..f7471a12b008 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -90,16 +90,6 @@ }; version = "3.2.4"; }; - charlock_holmes = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0hybw8jw9ryvz5zrki3gc9r88jqy373m6v46ynxsdzv1ysiyr40p"; - type = "gem"; - }; - version = "0.7.7"; - }; coderay = { source = { remotes = ["https://rubygems.org"]; @@ -173,16 +163,6 @@ }; version = "1.11.0"; }; - escape_utils = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "182ha3nmsc6ny4384233pav58a5x2spjn838w9nciwb29lxah1x3"; - type = "gem"; - }; - version = "1.2.2"; - }; factory_bot = { dependencies = ["activesupport"]; groups = ["development" "test"]; @@ -226,27 +206,16 @@ }; version = "15.5.0"; }; - github-linguist = { - dependencies = ["charlock_holmes" "escape_utils" "mini_mime" "rugged"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "10biwhh50fdssqs3ai651qgv079bn6h06g5cv00jc5s73iszfns9"; - type = "gem"; - }; - version = "7.20.0"; - }; gitlab-labkit = { dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m2n5lvnm5nxn7bc6bqm3ycwk47kck6nl1c0s83pcvsn6qizbsx7"; + sha256 = "09xlv72nbys9a5iqvhxfzdr7vy3s3m2a6ixqb9vq71k925faq6gb"; type = "gem"; }; - version = "0.28.0"; + version = "0.29.0"; }; gitlab-license_finder = { dependencies = ["rubyzip" "thor" "tomlrb" "with_env" "xml-simple"]; @@ -274,10 +243,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p4aa5nnkkrdd3v3i57092vj2agj7ih3zavymw451j52k8anqras"; + sha256 = "1dcgkhjiaxha3yznyxxzm8a4n4jf61rk7kgbxy4sdkb865zbn2ab"; type = "gem"; }; - version = "3.21.9"; + version = "3.21.12"; }; googleapis-common-protos-types = { dependencies = ["google-protobuf"]; @@ -370,16 +339,6 @@ }; version = "0.9.2"; }; - mini_mime = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5"; - type = "gem"; - }; - version = "1.1.2"; - }; mini_portile2 = { groups = ["default"]; platforms = []; diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 535d4faa13a9..74fd1ab320e0 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "14.13.0"; + version = "14.14.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-KN1twfuamRsG5/jan4Frhd4LXOU9Bp5Htex+TsTc+Is="; + sha256 = "sha256-zXRLaEy2Q+mm1GLjLB1AxRtBxXAoLw6PA1YOJfvVhoc="; }; buildInputs = [ ruby ]; patches = [ ./remove-hardcoded-locations.patch ]; - vendorSha256 = "sha256-CAadjiZCopjGNxQTJbvs56THtAve92ewiFLjGTY2/9E="; + vendorSha256 = "sha256-mhmM33cXJbqVJ1jY82Mi/nWzz7HXdxxSsFNQknFkwpQ="; 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 3cf201a9fef5..ef0dda83ddcc 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 = "15.6.2"; + version = "15.7.2"; src = fetchFromGitLab { owner = data.owner; @@ -16,7 +16,7 @@ buildGoModule rec { sourceRoot = "source/workhorse"; - vendorSha256 = "sha256-VqJqyRRFmDugq0VG7gPBxllikVNv5et93jJHleSTS7M="; + vendorSha256 = "sha256-TrLc5L4kLAdu1CEM3ezw6hhF6Icy3rXkFyUaVTUQ6X4="; 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 a2997bff4d3b..417dc56637da 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -8,18 +8,18 @@ if ENV['BUNDLER_CHECKSUM_VERIFICATION_OPT_IN'] # this verification is still expe Bundler::Checksum.patch! end -gem 'bundler-checksum', '~> 0.1.0', path: 'bundler-checksum', require: false +gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', require: false # 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.6.1' -gem 'bootsnap', '~> 1.13.0', require: false +gem 'bootsnap', '~> 1.15.0', require: false # Pin openssl to match the version bundled with our supported Rubies. # See https://stdgems.org/openssl/#gem-version. -gem 'openssl', '2.2.1' +gem 'openssl', '2.2.2' # This gem was originally bundled with Ruby 2.7, but is unbundled as of Ruby 3. # Since the latest version caused problems with GitLab, we pin this to an older # version for now. @@ -50,31 +50,31 @@ gem 'declarative_policy', '~> 1.1.0' # Authentication libraries gem 'devise', '~> 4.8.1' -gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'devise-pbkdf2-encryptable' +gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'vendor/gems/devise-pbkdf2-encryptable' gem 'bcrypt', '~> 3.1', '>= 3.1.14' -gem 'doorkeeper', '~> 5.5.0.rc2' -gem 'doorkeeper-openid_connect', '~> 1.7.5' +gem 'doorkeeper', '~> 5.5' +gem 'doorkeeper-openid_connect', '~> 1.8' gem 'rexml', '~> 3.2.5' gem 'ruby-saml', '~> 1.13.0' gem 'omniauth', '~> 2.1.0' gem 'omniauth-auth0', '~> 2.0.0' gem 'omniauth-azure-activedirectory-v2', '~> 2.0' -gem 'omniauth-azure-oauth2', '~> 0.0.9', path: 'omniauth-azure-oauth2' # See gem README.md -gem 'omniauth-cas3', '~> 1.1.4', path: 'omniauth-cas3' # See vendor/gems/omniauth-cas3/README.md +gem 'omniauth-azure-oauth2', '~> 0.0.9', path: 'vendor/gems/omniauth-azure-oauth2' # See gem README.md +gem 'omniauth-cas3', '~> 1.1.4', path: 'vendor/gems/omniauth-cas3' # See vendor/gems/omniauth-cas3/README.md gem 'omniauth-dingtalk-oauth2', '~> 1.0' gem 'omniauth-alicloud', '~> 2.0.0' gem 'omniauth-facebook', '~> 4.0.0' gem 'omniauth-github', '2.0.1' -gem 'omniauth-gitlab', '~> 4.0.0', path: 'omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md +gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md gem 'omniauth-google-oauth2', '~> 1.1' gem 'omniauth-oauth2-generic', '~> 0.2.2' gem 'omniauth-saml', '~> 2.0.0' gem 'omniauth-shibboleth', '~> 1.3.0' gem 'omniauth-twitter', '~> 1.4' -gem 'omniauth_crowd', '~> 2.4.0', path: 'omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md +gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md gem 'omniauth-authentiq', '~> 0.3.3' gem 'gitlab-omniauth-openid-connect', '~> 0.10.0', require: 'omniauth_openid_connect' -gem 'omniauth-salesforce', '~> 1.0.5', path: 'omniauth-salesforce' # See gem README.md +gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce' # See gem README.md gem 'omniauth-atlassian-oauth2', '~> 0.2.0' gem 'rack-oauth2', '~> 1.21.3' gem 'jwt', '~> 2.1.0' @@ -91,7 +91,7 @@ gem 'invisible_captcha', '~> 2.0.0' # Two-factor authentication gem 'devise-two-factor', '~> 4.0.2' gem 'rqrcode-rails3', '~> 0.1.7' -gem 'attr_encrypted', '~> 3.2.4', path: 'attr_encrypted' +gem 'attr_encrypted', '~> 3.2.4', path: 'vendor/gems/attr_encrypted' gem 'u2f', '~> 0.2.1' # GitLab Pages @@ -107,7 +107,7 @@ gem 'browser', '~> 5.3.1' gem 'ohai', '~> 16.10' # GPG -gem 'gpgme', '~> 2.0.19' +gem 'gpgme', '~> 2.0.22' # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes @@ -166,9 +166,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.167.0' +gem 'aws-sdk-core', '~> 3.168.4' gem 'aws-sdk-cloudformation', '~> 1' -gem 'aws-sdk-s3', '~> 1.117.1' +gem 'aws-sdk-s3', '~> 1.117.2' gem 'faraday_middleware-aws-sigv4', '~>0.3.0' gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections @@ -190,7 +190,7 @@ gem 'asciidoctor-kroki', '~> 0.7.0', require: false gem 'rouge', '~> 3.30.0' gem 'truncato', '~> 0.7.12' gem 'bootstrap_form', '~> 4.2.0' -gem 'nokogiri', '~> 1.13.9' +gem 'nokogiri', '~> 1.13.10' # Calendar rendering gem 'icalendar' @@ -242,7 +242,7 @@ gem 're2', '~> 1.6.0' # Misc -gem 'version_sorter', '~> 2.2.4' +gem 'version_sorter', '~> 2.3' # Export Ruby Regex to Javascript gem 'js_regex', '~> 3.8' @@ -264,9 +264,6 @@ gem 'discordrb-webhooks', '~> 3.4', require: false gem 'jira-ruby', '~> 2.1.4' gem 'atlassian-jwt', '~> 0.2.0' -# Flowdock integration -gem 'flowdock', '~> 0.7' - # Slack integration gem 'slack-messenger', '~> 2.3.4' @@ -280,14 +277,14 @@ gem 'asana', '~> 0.10.13' gem 'ruby-fogbugz', '~> 0.3.0' # Kubernetes integration -gem 'kubeclient', '~> 4.9.3' +gem 'kubeclient', '~> 4.9.3', path: 'vendor/gems/kubeclient' # Sanitize user input gem 'sanitize', '~> 6.0' gem 'babosa', '~> 1.0.4' # Sanitizes SVG input -gem 'loofah', '~> 2.19.0' +gem 'loofah', '~> 2.19.1' # Working with license # Detects the open source license the repository includes @@ -352,16 +349,16 @@ gem 'batch-loader', '~> 2.0.1' gem 'peek', '~> 1.1' # Snowplow events tracking -gem 'snowplow-tracker', '~> 0.6.1' +gem 'snowplow-tracker', '~> 0.8.0' # Metrics gem 'webrick', '~> 1.6.1', require: false -gem 'prometheus-client-mmap', '~> 0.16', require: 'prometheus/client' +gem 'prometheus-client-mmap', '~> 0.17', require: 'prometheus/client' gem 'warning', '~> 1.3.0' group :development do - gem 'lefthook', '~> 1.2.0', require: false + gem 'lefthook', '~> 1.2.6', require: false gem 'rubocop' gem 'solargraph', '~> 0.47.2', require: false @@ -372,6 +369,8 @@ group :development do gem 'better_errors', '~> 2.9.1' gem 'sprite-factory', '~> 1.7' + + gem "listen", "~> 3.7" end group :development, :test do @@ -393,10 +392,10 @@ group :development, :test do # Generate Fake data gem 'ffaker', '~> 2.10' - gem 'spring', '~> 2.1.0' + gem 'spring', '~> 4.1.0' gem 'spring-commands-rspec', '~> 1.0.4' - gem 'gitlab-styles', '~> 9.0.0', require: false + gem 'gitlab-styles', '~> 9.1.0', require: false gem 'haml_lint', '~> 0.40.0', require: false gem 'bundler-audit', '~> 0.7.0.1', require: false @@ -410,8 +409,6 @@ group :development, :test do gem 'simple_po_parser', '~> 1.1.6', require: false - gem 'timecop', '~> 0.9.1' - gem 'png_quantizator', '~> 0.2.1', require: false gem 'parallel', '~> 1.19', require: false @@ -424,7 +421,7 @@ group :development, :test do end group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 3.6.2', require: false + gem 'gitlab-dangerfiles', '~> 3.6.4', require: false end group :development, :test, :coverage do @@ -506,7 +503,7 @@ gem 'kas-grpc', '~> 0.0.2' gem 'grpc', '~> 1.42.0' -gem 'google-protobuf', '~> 3.21', '>= 3.21.9' +gem 'google-protobuf', '~> 3.21', '>= 3.21.12' gem 'toml-rb', '~> 2.2.0' @@ -525,7 +522,7 @@ gem 'grape_logging', '~> 1.8' gem 'gitlab-net-dns', '~> 0.9.1' # Countries list -gem 'countries', '~> 3.0' +gem 'countries', '~> 4.0.0' gem 'retriable', '~> 3.1.2' @@ -536,9 +533,9 @@ gem 'lru_redux' # Monkey-patched in `config/initializers/mail_encoding_patch.rb` # See https://gitlab.com/gitlab-org/gitlab/issues/197386 gem 'mail', '= 2.7.1' -gem 'mail-smtp_pool', '~> 0.1.0', path: 'mail-smtp_pool', require: false +gem 'mail-smtp_pool', '~> 0.1.0', path: 'vendor/gems/mail-smtp_pool', require: false -gem 'microsoft_graph_mailer', '~> 0.1.0', path: 'microsoft_graph_mailer' +gem 'microsoft_graph_mailer', '~> 0.1.0', path: 'vendor/gems/microsoft_graph_mailer' # File encryption gem 'lockbox', '~> 0.6.2' @@ -561,13 +558,13 @@ gem 'ipaddress', '~> 0.8.3' gem 'parslet', '~> 1.8' -gem 'ipynbdiff', path: 'ipynbdiff' +gem 'ipynbdiff', path: 'vendor/gems/ipynbdiff' 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: 'error_tracking_open_api' +gem 'error_tracking_open_api', path: 'vendor/gems/error_tracking_open_api' # Vulnerability advisories gem 'cvss-suite', '~> 3.0.1', require: 'cvss_suite' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index c179654f21dd..087d4d8aeec0 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -1,51 +1,60 @@ PATH - remote: attr_encrypted + remote: vendor/gems/attr_encrypted specs: attr_encrypted (3.2.4) encryptor (~> 3.0.0) PATH - remote: bundler-checksum + remote: vendor/gems/bundler-checksum specs: bundler-checksum (0.1.0) bundler PATH - remote: devise-pbkdf2-encryptable + remote: vendor/gems/devise-pbkdf2-encryptable specs: devise-pbkdf2-encryptable (0.0.0) devise (~> 4.0) devise-two-factor (~> 4.0) PATH - remote: error_tracking_open_api + remote: vendor/gems/error_tracking_open_api specs: error_tracking_open_api (1.0.0) typhoeus (~> 1.0, >= 1.0.1) PATH - remote: ipynbdiff + remote: vendor/gems/ipynbdiff specs: ipynbdiff (0.4.7) diffy (~> 3.4) oj (~> 3.13.16) PATH - remote: mail-smtp_pool + remote: vendor/gems/kubeclient + specs: + kubeclient (4.9.4.pre.gitlab1) + http (>= 3.0, < 6.0) + jsonpath (~> 1.0) + recursive-open-struct (~> 1.1, >= 1.1.1) + rest-client (~> 2.0) + +PATH + remote: vendor/gems/mail-smtp_pool specs: mail-smtp_pool (0.1.0) connection_pool (~> 2.0) mail (~> 2.7) PATH - remote: microsoft_graph_mailer + remote: vendor/gems/microsoft_graph_mailer specs: microsoft_graph_mailer (0.1.0) mail (~> 2.7) oauth2 (>= 1.4.4, < 3) PATH - remote: omniauth-azure-oauth2 + remote: vendor/gems/omniauth-azure-oauth2 specs: omniauth-azure-oauth2 (0.0.10) jwt (>= 1.0, < 3.0) @@ -53,7 +62,7 @@ PATH omniauth-oauth2 (~> 1.4) PATH - remote: omniauth-cas3 + remote: vendor/gems/omniauth-cas3 specs: omniauth-cas3 (1.1.4) addressable (~> 2.3) @@ -61,21 +70,21 @@ PATH omniauth (~> 2.0) PATH - remote: omniauth-gitlab + remote: vendor/gems/omniauth-gitlab specs: omniauth-gitlab (4.0.0) omniauth (~> 2.0) omniauth-oauth2 (~> 1.8) PATH - remote: omniauth-salesforce + remote: vendor/gems/omniauth-salesforce specs: omniauth-salesforce (1.0.5) omniauth (~> 2.0) omniauth-oauth2 (~> 1.0) PATH - remote: omniauth_crowd + remote: vendor/gems/omniauth_crowd specs: omniauth_crowd (2.4.0) activesupport @@ -185,19 +194,19 @@ GEM awesome_print (1.9.2) awrence (1.1.1) aws-eventstream (1.2.0) - aws-partitions (1.658.0) + aws-partitions (1.674.0) aws-sdk-cloudformation (1.41.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.167.0) + aws-sdk-core (3.168.4) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.59.0) + aws-sdk-kms (1.61.0) aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.117.1) + aws-sdk-s3 (1.117.2) aws-sdk-core (~> 3, >= 3.165.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) @@ -229,7 +238,7 @@ GEM rack (>= 0.9.0) bindata (2.4.11) binding_ninja (0.2.3) - bootsnap (1.13.0) + bootsnap (1.15.0) msgpack (~> 1.2) bootstrap_form (4.2.0) actionpack (>= 5.0) @@ -284,16 +293,14 @@ GEM commonmarker (0.23.6) concurrent-ruby (1.1.10) connection_pool (2.3.0) - contracts (0.11.0) cork (0.3.0) colored2 (~> 3.1) cose (1.0.0) cbor (~> 0.5.9) openssl-signature_algorithm (~> 0.4.0) - countries (3.0.0) - i18n_data (~> 0.8.0) + countries (4.0.1) + i18n_data (~> 0.13.0) sixarm_ruby_unaccent (~> 1.1) - unicode_utils (~> 1.4) crack (0.4.3) safe_yaml (~> 1.0.0) crass (1.0.6) @@ -363,11 +370,11 @@ GEM docile (1.4.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - doorkeeper (5.5.0.rc2) + doorkeeper (5.5.4) railties (>= 5) - doorkeeper-openid_connect (1.7.5) - doorkeeper (>= 5.2, < 5.5) - json-jwt (>= 1.11.0) + doorkeeper-openid_connect (1.8.3) + doorkeeper (>= 5.5, < 5.7) + json-jwt (>= 1.15.0) dotenv (2.7.6) dry-configurable (0.12.0) concurrent-ruby (~> 1.0) @@ -484,9 +491,6 @@ GEM flipper-active_support_cache_store (0.25.0) activesupport (>= 4.2, < 8) flipper (~> 0.25.0) - flowdock (0.7.1) - httparty (~> 0.7) - multi_json fog-aliyun (0.3.3) fog-core fog-json @@ -556,12 +560,12 @@ GEM rchardet (~> 1.8) gitaly (15.5.2) grpc (~> 1.0) - gitlab (4.16.1) - httparty (~> 0.14, >= 0.14.0) - terminal-table (~> 1.5, >= 1.5.1) + gitlab (4.19.0) + httparty (~> 0.20) + terminal-table (>= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-dangerfiles (3.6.2) + gitlab-dangerfiles (3.6.4) danger (>= 8.4.5) danger-gitlab (>= 8.0.0) rake @@ -594,13 +598,13 @@ GEM gitlab-sidekiq-fetcher (0.9.0) json (>= 2.5) sidekiq (~> 6.1) - gitlab-styles (9.0.0) - rubocop (~> 1.36.0) + gitlab-styles (9.1.0) + rubocop (~> 1.38.0) rubocop-gitlab-security (~> 0.1.1) rubocop-graphql (~> 0.14) rubocop-performance (~> 1.14) rubocop-rails (~> 2.15) - rubocop-rspec (~> 2.12) + rubocop-rspec (~> 2.15) gitlab_chronic_duration (0.10.6.2) numerizer (~> 0.2) gitlab_omniauth-ldap (2.2.0) @@ -651,7 +655,7 @@ GEM google-apis-core (>= 0.9.1, < 2.a) google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) - google-protobuf (3.21.9) + google-protobuf (3.21.12) googleapis-common-protos-types (1.3.0) google-protobuf (~> 3.14) googleauth (1.3.0) @@ -661,8 +665,8 @@ GEM multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) - gpgme (2.0.20) - mini_portile2 (~> 2.3) + gpgme (2.0.22) + mini_portile2 (~> 2.7) grape (1.5.2) activesupport builder @@ -753,24 +757,22 @@ GEM nokogiri (~> 1.6) htmlbeautifier (1.4.2) htmlentities (4.3.4) - http (4.4.1) - addressable (~> 2.3) + http (5.1.0) + addressable (~> 2.8) http-cookie (~> 1.0) http-form_data (~> 2.2) - http-parser (~> 1.2.0) + llhttp-ffi (~> 0.4.0) http-accept (1.7.0) http-cookie (1.0.5) domain_name (~> 0.5) http-form_data (2.3.0) - http-parser (1.2.3) - ffi-compiler (>= 1.0, < 2.0) httparty (0.20.0) mime-types (~> 3.0) multi_xml (>= 0.5.2) httpclient (2.8.3) i18n (1.12.0) concurrent-ruby (~> 1.0) - i18n_data (0.8.0) + i18n_data (0.13.1) icalendar (2.8.0) ice_cube (~> 0.16) ice_cube (0.16.4) @@ -789,7 +791,7 @@ GEM atlassian-jwt multipart-post oauth (~> 0.5, >= 0.5.0) - jmespath (1.6.1) + jmespath (1.6.2) js_regex (3.8.0) character_set (~> 1.4) regexp_parser (~> 2.5) @@ -828,14 +830,9 @@ GEM rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - kubeclient (4.9.3) - http (>= 3.0, < 5.0) - jsonpath (~> 1.0) - recursive-open-struct (~> 1.1, >= 1.1.1) - rest-client (~> 2.0) launchy (2.5.0) addressable (~> 2.7) - lefthook (1.2.0) + lefthook (1.2.6) letter_opener (1.7.0) launchy (~> 2.2) letter_opener_web (2.0.0) @@ -860,6 +857,9 @@ GEM listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) + llhttp-ffi (0.4.0) + ffi-compiler (~> 1.0) + rake (~> 13.0) locale (2.1.3) lockbox (0.6.2) lograge (0.11.2) @@ -867,7 +867,7 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.19.0) + loofah (2.19.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) lookbook (1.2.1) @@ -938,7 +938,7 @@ GEM netrc (0.11.0) nio4r (2.5.8) no_proxy_fix (0.1.2) - nokogiri (1.13.9) + nokogiri (1.13.10) mini_portile2 (~> 2.8.0) racc (~> 1.4) notiffany (0.1.3) @@ -1028,7 +1028,7 @@ GEM validate_email validate_url webfinger (>= 1.0.1) - openssl (2.2.1) + openssl (2.2.2) ipaddr openssl-signature_algorithm (0.4.0) opentracing (0.5.0) @@ -1061,7 +1061,7 @@ GEM expgen (~> 0.1) rainbow (~> 3.1.1) parallel (1.22.1) - parser (3.1.2.1) + parser (3.1.3.0) ast (~> 2.4.1) parslet (1.8.2) pastel (0.8.0) @@ -1086,7 +1086,7 @@ GEM coderay parser unparser - prometheus-client-mmap (0.16.2) + prometheus-client-mmap (0.17.0) pry (0.13.1) coderay (~> 1.1) method_source (~> 1.0) @@ -1107,7 +1107,7 @@ GEM puma (>= 2.7) pyu-ruby-sasl (0.0.3.3) raabro (1.4.0) - racc (1.6.0) + racc (1.6.1) rack (2.2.4) rack-accept (0.4.5) rack (>= 0.4) @@ -1258,31 +1258,31 @@ GEM pg rails sqlite3 - rubocop (1.36.0) + rubocop (1.38.0) json (~> 2.3) parallel (~> 1.10) parser (>= 3.1.2.1) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.20.1, < 2.0) + rubocop-ast (>= 1.23.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.21.0) + rubocop-ast (1.23.0) parser (>= 3.1.1.0) rubocop-gitlab-security (0.1.1) rubocop (>= 0.51) - rubocop-graphql (0.14.6) + rubocop-graphql (0.18.0) rubocop (>= 0.87, < 2) - rubocop-performance (1.14.3) + rubocop-performance (1.15.0) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.15.2) + rubocop-rails (2.17.2) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 1.7.0, < 2.0) - rubocop-rspec (2.12.1) - rubocop (~> 1.31) + rubocop (>= 1.33.0, < 2.0) + rubocop-rspec (2.15.0) + rubocop (~> 1.33) ruby-fogbugz (0.3.0) crack (~> 0.4) multipart-post (~> 2.0) @@ -1322,7 +1322,7 @@ GEM sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) - sd_notify (0.1.0) + sd_notify (0.1.1) securecompare (1.0.0) seed-fu (2.3.7) activerecord (>= 3.1) @@ -1377,8 +1377,7 @@ GEM snaky_hash (2.0.0) hashie version_gem (~> 1.1) - snowplow-tracker (0.6.1) - contracts (~> 0.7, <= 0.11) + snowplow-tracker (0.8.0) solargraph (0.47.2) backport (~> 1.2) benchmark @@ -1399,7 +1398,7 @@ GEM set (~> 1.0) spamcheck (1.0.0) grpc (~> 1.0) - spring (2.1.1) + spring (4.1.0) spring-commands-rspec (1.0.4) spring (>= 0.9.1) sprite-factory (1.7.1) @@ -1442,8 +1441,8 @@ GEM temple (0.8.2) term-ansicolor (1.7.1) tins (~> 1.0) - terminal-table (1.8.0) - unicode-display_width (~> 1.1, >= 1.1.1) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) terser (1.0.2) execjs (>= 0.3.0, < 3) test-prof (1.0.7) @@ -1453,7 +1452,6 @@ GEM thor (1.2.1) thrift (0.16.0) tilt (2.0.11) - timecop (0.9.1) timeliness (0.3.10) timfel-krb5-auth (0.8.3) tins (1.31.1) @@ -1526,7 +1524,7 @@ GEM activerecord (>= 3.0) activesupport (>= 3.0) version_gem (1.1.0) - version_sorter (2.2.4) + version_sorter (2.3.0) view_component (2.74.1) activesupport (>= 5.0.0, < 8.0) concurrent-ruby (~> 1.0) @@ -1569,7 +1567,7 @@ GEM nokogiri (~> 1.8) yajl-ruby (1.4.3) yard (0.9.26) - zeitwerk (2.6.0) + zeitwerk (2.6.6) PLATFORMS ruby @@ -1594,8 +1592,8 @@ DEPENDENCIES autoprefixer-rails (= 10.2.5.1) awesome_print aws-sdk-cloudformation (~> 1) - aws-sdk-core (~> 3.167.0) - aws-sdk-s3 (~> 1.117.1) + aws-sdk-core (~> 3.168.4) + aws-sdk-s3 (~> 1.117.2) babosa (~> 1.0.4) base32 (~> 0.3.0) batch-loader (~> 2.0.1) @@ -1603,7 +1601,7 @@ DEPENDENCIES benchmark-ips (~> 2.3.0) benchmark-memory (~> 0.1) better_errors (~> 2.9.1) - bootsnap (~> 1.13.0) + bootsnap (~> 1.15.0) bootstrap_form (~> 4.2.0) browser (~> 5.3.1) bullet (~> 7.0.2) @@ -1616,7 +1614,7 @@ DEPENDENCIES commonmarker (~> 0.23.6) concurrent-ruby (~> 1.1) connection_pool (~> 2.0) - countries (~> 3.0) + countries (~> 4.0.0) creole (~> 0.5.0) crystalball (~> 0.7.0) cvss-suite (~> 3.0.1) @@ -1633,8 +1631,8 @@ DEPENDENCIES diff_match_patch (~> 0.1.0) diffy (~> 3.4) discordrb-webhooks (~> 3.4) - doorkeeper (~> 5.5.0.rc2) - doorkeeper-openid_connect (~> 1.7.5) + doorkeeper (~> 5.5) + doorkeeper-openid_connect (~> 1.8) ed25519 (~> 1.3.0) elasticsearch-api (= 7.13.3) elasticsearch-model (~> 7.2) @@ -1650,7 +1648,6 @@ DEPENDENCIES flipper (~> 0.25.0) flipper-active_record (~> 0.25.0) flipper-active_support_cache_store (~> 0.25.0) - flowdock (~> 0.7) fog-aliyun (~> 0.3) fog-aws (~> 3.15) fog-core (= 2.1.0) @@ -1665,7 +1662,7 @@ DEPENDENCIES gettext_i18n_rails_js (~> 1.3) gitaly (~> 15.5.2) gitlab-chronic (~> 0.10.5) - gitlab-dangerfiles (~> 3.6.2) + gitlab-dangerfiles (~> 3.6.4) gitlab-experiment (~> 0.7.1) gitlab-fog-azure-rm (~> 1.4.0) gitlab-labkit (~> 0.29.0) @@ -1675,13 +1672,13 @@ DEPENDENCIES gitlab-net-dns (~> 0.9.1) gitlab-omniauth-openid-connect (~> 0.10.0) gitlab-sidekiq-fetcher (= 0.9.0) - gitlab-styles (~> 9.0.0) + gitlab-styles (~> 9.1.0) gitlab_chronic_duration (~> 0.10.6.2) gitlab_omniauth-ldap (~> 2.2.0) gon (~> 6.4.0) google-api-client (~> 0.33) - google-protobuf (~> 3.21, >= 3.21.9) - gpgme (~> 2.0.19) + google-protobuf (~> 3.21, >= 3.21.12) + gpgme (~> 2.0.22) grape (~> 1.5.2) grape-entity (~> 0.10.0) grape-path-helpers (~> 1.7.1) @@ -1718,14 +1715,15 @@ DEPENDENCIES kas-grpc (~> 0.0.2) knapsack (~> 1.21.1) kramdown (~> 2.3.1) - kubeclient (~> 4.9.3) - lefthook (~> 1.2.0) + kubeclient (~> 4.9.3)! + lefthook (~> 1.2.6) letter_opener_web (~> 2.0.0) license_finder (~> 7.0) licensee (~> 9.15) + listen (~> 3.7) lockbox (~> 0.6.2) lograge (~> 0.5) - loofah (~> 2.19.0) + loofah (~> 2.19.1) lookbook (~> 1.2, >= 1.2.1) lru_redux mail (= 2.7.1) @@ -1738,7 +1736,7 @@ DEPENDENCIES multi_json (~> 1.14.1) net-ldap (~> 0.16.3) net-ntp - nokogiri (~> 1.13.9) + nokogiri (~> 1.13.10) oauth2 (~> 2.0) octokit (~> 4.15) ohai (~> 16.10) @@ -1763,7 +1761,7 @@ DEPENDENCIES omniauth-shibboleth (~> 1.3.0) omniauth-twitter (~> 1.4) omniauth_crowd (~> 2.4.0)! - openssl (= 2.2.1) + openssl (= 2.2.2) org-ruby (~> 0.9.12) pact (~> 1.63) parallel (~> 1.19) @@ -1773,7 +1771,7 @@ DEPENDENCIES pg_query (~> 2.2) png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) - prometheus-client-mmap (~> 0.16) + prometheus-client-mmap (~> 0.17) pry-byebug pry-rails (~> 0.3.9) pry-shell (~> 0.5.1) @@ -1835,10 +1833,10 @@ DEPENDENCIES simplecov-cobertura (~> 1.3.1) simplecov-lcov (~> 0.8.0) slack-messenger (~> 2.3.4) - snowplow-tracker (~> 0.6.1) + snowplow-tracker (~> 0.8.0) solargraph (~> 0.47.2) spamcheck (~> 1.0.0) - spring (~> 2.1.0) + spring (~> 4.1.0) spring-commands-rspec (~> 1.0.4) sprite-factory (~> 1.7) sprockets (~> 3.7.0) @@ -1852,7 +1850,6 @@ DEPENDENCIES test-prof (~> 1.0.7) test_file_finder (~> 0.1.3) thrift (>= 0.16.0) - timecop (~> 0.9.1) timfel-krb5-auth (~> 0.8) toml-rb (~> 2.2.0) truncato (~> 0.7.12) @@ -1863,7 +1860,7 @@ DEPENDENCIES unleash (~> 3.2.2) valid_email (~> 0.1) validates_hostname (~> 1.0.11) - version_sorter (~> 2.2.4) + version_sorter (~> 2.3) view_component (~> 2.74.1) vmstat (~> 2.3.0) warning (~> 1.3.0) @@ -1874,4 +1871,4 @@ DEPENDENCIES yajl-ruby (~> 1.4.3) BUNDLED WITH - 2.3.25 + 2.3.26 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 69ac4830afce..968d07704fcb 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -1,3 +1,4 @@ +src: { acme-client = { dependencies = ["faraday" "faraday-retry"]; @@ -290,6 +291,16 @@ }; version = "0.2.0"; }; + attr_encrypted = { + dependencies = ["encryptor"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/vendor/gems/attr_encrypted"; + type = "path"; + }; + version = "3.2.4"; + }; attr_required = { groups = ["default"]; platforms = []; @@ -346,10 +357,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z5k0zi8lnlwmxp27aqic6l9rmc15g6y62awpb3nhkkwr0gy58mv"; + sha256 = "0a4inr58vqzqb6g4j09pch55xyhj4kbbl4drsk1apfwhakc70vpr"; type = "gem"; }; - version = "1.658.0"; + version = "1.674.0"; }; aws-sdk-cloudformation = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -368,10 +379,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "095nj7sf8914y60m1grnpy7cm6ybnw4ywnc0j84gz2vgv1m8awfk"; + sha256 = "131acgw2hi893n0dfbczs42bkc41afhyrmd9w8zx5y8r1k5zd6rc"; type = "gem"; }; - version = "3.167.0"; + version = "3.168.4"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -379,10 +390,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lq1f03gy02f8z5fpc61kngkja8kkgk2m8cc6g42aij0iszjw03c"; + sha256 = "0ajp7yvnf95d60xmg618xznfwsy8h1vrkzj33r1bsf2gsfp50vzy"; type = "gem"; }; - version = "1.59.0"; + version = "1.61.0"; }; aws-sdk-s3 = { dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; @@ -390,10 +401,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17ah9j82313ynb8nkcbq21fa3dy1a3v6lk5kdrhphazbpb2xmxkn"; + sha256 = "1xpb8c8zw1c0grbw1rcc0ynlys1301vm9kkqy4ls3i2zqk5v6n91"; type = "gem"; }; - version = "1.117.1"; + version = "1.117.2"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -576,10 +587,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y1ycmvyd7swp6gy85m7znwilvb61zzcx6najgq0d1glq0p2hwy6"; + sha256 = "1ln89f9ypzincd5hqgmzd5vvfgf7fgir56v1spsri40ma88vnipj"; type = "gem"; }; - version = "1.13.0"; + version = "1.15.0"; }; bootstrap_form = { dependencies = ["actionpack" "activemodel"]; @@ -634,6 +645,16 @@ }; version = "0.7.0.1"; }; + bundler-checksum = { + dependencies = []; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/vendor/gems/bundler-checksum"; + type = "path"; + }; + version = "0.1.0"; + }; byebug = { groups = ["default" "development" "test"]; platforms = [{ @@ -849,16 +870,6 @@ }; version = "2.3.0"; }; - contracts = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "11kj7hdr94hxgxad9wazncvaxzaxlbvw6laq179ivhw9za746vnz"; - type = "gem"; - }; - version = "0.11.0"; - }; cork = { dependencies = ["colored2"]; groups = ["default" "development"]; @@ -882,15 +893,15 @@ version = "1.0.0"; }; countries = { - dependencies = ["i18n_data" "sixarm_ruby_unaccent" "unicode_utils"]; + dependencies = ["i18n_data" "sixarm_ruby_unaccent"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w278pjhwkbin7jpr7m47wac7gj5n4l2him9k2q4ngzq6rs2id7c"; + sha256 = "1ic1zbzqbrvb3myhgzpq4vigr3qnyl2r0vga84d9z5121cy8lbnk"; type = "gem"; }; - version = "3.0.0"; + version = "4.0.1"; }; crack = { dependencies = ["safe_yaml"]; @@ -1092,8 +1103,18 @@ }; version = "4.8.1"; }; + devise-pbkdf2-encryptable = { + dependencies = ["devise" "devise-two-factor"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/vendor/gems/devise-pbkdf2-encryptable"; + type = "path"; + }; + version = "0.0.0"; + }; devise-two-factor = { - dependencies = ["activesupport" "devise" "railties" "rotp"]; + dependencies = ["activesupport" "attr_encrypted" "devise" "railties" "rotp"]; groups = ["default"]; platforms = []; source = { @@ -1171,10 +1192,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mdjnw5n2r3hclg4gmzx19w750sdcxw9y6dhcawbzb9wrbzj58wk"; + sha256 = "188ybg2cgghcp5r1jpfnbx3anf0z8fzlla72jra0vgwkdylk7qkz"; type = "gem"; }; - version = "5.5.0.rc2"; + version = "5.5.4"; }; doorkeeper-openid_connect = { dependencies = ["doorkeeper" "json-jwt"]; @@ -1182,10 +1203,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cj7b45lxiifi6pw8gnylfzlhji572v0pj896rbyqjwyzlgj1sid"; + sha256 = "0vhbw2la2hx9dm0jg14hfah6blwhifrrg7k6nkyl67wga0afgwhd"; type = "gem"; }; - version = "1.7.5"; + version = "1.8.3"; }; dotenv = { groups = ["default"]; @@ -1388,6 +1409,16 @@ }; version = "3.0.0"; }; + error_tracking_open_api = { + dependencies = ["typhoeus"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/vendor/gems/error_tracking_open_api"; + type = "path"; + }; + version = "1.0.0"; + }; erubi = { groups = ["default" "development" "test"]; platforms = []; @@ -1785,17 +1816,6 @@ }; version = "0.25.0"; }; - flowdock = { - dependencies = ["httparty" "multi_json"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "04nrvg4gzgabf5mnnhccl8bwrkvn3y4pm7a1dqzqhpvfr4m5pafg"; - type = "gem"; - }; - version = "0.7.1"; - }; fog-aliyun = { dependencies = ["fog-core" "fog-json" "ipaddress" "xml-simple"]; groups = ["default"]; @@ -2029,10 +2049,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kq77304vn733xc8iipq4wpdk5qb0zwjryhm3fia3mfsrdcp1z8k"; + sha256 = "0ycnjjk1im5a82k02avix7c5c87vrkl87gsghgq29g2x34z5wr1z"; type = "gem"; }; - version = "4.16.1"; + version = "4.19.0"; }; gitlab-chronic = { dependencies = ["numerizer"]; @@ -2051,10 +2071,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1if6makvlxxmjsyaga660smrw4ij9a0b6xh7mmifih5mpcr5an48"; + sha256 = "0v3m056hpds46byqsacvf4y4xgikgm9ngmz0xlrz57il812a4kl6"; type = "gem"; }; - version = "3.6.2"; + version = "3.6.4"; }; gitlab-experiment = { dependencies = ["activesupport" "request_store"]; @@ -2157,10 +2177,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b9vvgdgzsaiq1kp3f38xm9bmigy8ky4v8lv63i5nyl0iymxy3pg"; + sha256 = "1ch27hxbby16jxvxg1jq3sqdbd3gg7ss4ymxn3yhsjy7gyglxza6"; type = "gem"; }; - version = "9.0.0"; + version = "9.1.0"; }; gitlab_chronic_duration = { dependencies = ["numerizer"]; @@ -2343,10 +2363,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p4aa5nnkkrdd3v3i57092vj2agj7ih3zavymw451j52k8anqras"; + sha256 = "1dcgkhjiaxha3yznyxxzm8a4n4jf61rk7kgbxy4sdkb865zbn2ab"; type = "gem"; }; - version = "3.21.9"; + version = "3.21.12"; }; googleapis-common-protos-types = { dependencies = ["google-protobuf"]; @@ -2376,10 +2396,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xbgh9d8nbvsvyzqnd0mzhz0nr9hx4qn025kmz6d837lry4lc6gw"; + sha256 = "0qn87vxdsaq1szcvq39rnz38cgqllncdxmiyghnbzl7x5aah8sbw"; type = "gem"; }; - version = "2.0.20"; + version = "2.0.22"; }; grape = { dependencies = ["activesupport" "builder" "dry-types" "mustermann-grape" "rack" "rack-accept"]; @@ -2703,15 +2723,15 @@ version = "4.3.4"; }; http = { - dependencies = ["addressable" "http-cookie" "http-form_data" "http-parser"]; + dependencies = ["addressable" "http-cookie" "http-form_data" "llhttp-ffi"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z8vmvnkrllkpzsxi94284di9r63g9v561a16an35izwak8g245y"; + sha256 = "0jn1y6sfxpfaq0hcblv8hhyxzam8n39kvypi07q2vxaimh6ly7mj"; type = "gem"; }; - version = "4.4.1"; + version = "5.1.0"; }; http-accept = { groups = ["default"]; @@ -2744,17 +2764,6 @@ }; version = "2.3.0"; }; - http-parser = { - dependencies = ["ffi-compiler"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "18qqvckvqjffh88hfib6c8pl9qwk9gp89w89hl3f2s1x8hgyqka1"; - type = "gem"; - }; - version = "1.2.3"; - }; httparty = { dependencies = ["mime-types" "multi_xml"]; groups = ["danger" "default" "development" "test"]; @@ -2792,10 +2801,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v0cdwxiaqdwhaljd7z0fbx29q3r5kjl93xnjm5abi1x37645ncj"; + sha256 = "0rizqqss1bvb668mw72ls7rlj6im82aizz230jxn7d39kaq9kap5"; type = "gem"; }; - version = "0.8.0"; + version = "0.13.1"; }; icalendar = { dependencies = ["ice_cube"]; @@ -2860,6 +2869,16 @@ }; version = "0.8.3"; }; + ipynbdiff = { + dependencies = ["diffy" "oj"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/vendor/gems/ipynbdiff"; + type = "path"; + }; + version = "0.4.7"; + }; jaeger-client = { dependencies = ["opentracing" "thrift"]; groups = ["default"]; @@ -2897,10 +2916,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mnvb80cdg7fzdcs3xscv21p28w4igk5sj5m7m81xp8v2ks87jj0"; + sha256 = "1cdw9vw2qly7q7r41s7phnac264rbsdqgj4l0h4nqgbjb157g393"; type = "gem"; }; - version = "1.6.1"; + version = "1.6.2"; }; js_regex = { dependencies = ["character_set" "regexp_parser" "regexp_property_values"]; @@ -3058,11 +3077,10 @@ groups = ["default"]; platforms = []; source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ih04d0vgj91rl66iaqh8jmpskwz3g6mgajid0wlzi5skxqqxlym"; - type = "gem"; + path = "${src}/vendor/gems/kubeclient"; + type = "path"; }; - version = "4.9.3"; + version = "4.9.4.pre.gitlab1"; }; launchy = { dependencies = ["addressable"]; @@ -3080,10 +3098,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1avkih414xnaznjlwp64cw4jhzvb7yd4szmnb88yvi7aj4n8r7hq"; + sha256 = "0qyylcc57pcf8mwm9dvlzkfjxcpbypnp4q21ni05s7wxalxb12ld"; type = "gem"; }; - version = "1.2.0"; + version = "1.2.6"; }; letter_opener = { dependencies = ["launchy"]; @@ -3150,6 +3168,17 @@ }; version = "3.7.1"; }; + llhttp-ffi = { + dependencies = ["ffi-compiler" "rake"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00dh6zmqdj59rhcya0l4b9aaxq6n8xizfbil93k0g06gndyk5xz5"; + type = "gem"; + }; + version = "0.4.0"; + }; locale = { groups = ["default" "development"]; platforms = []; @@ -3187,10 +3216,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fpyk1965py77al7iadkn5dibwgvybknkr7r8bii2dj73wvr29rh"; + sha256 = "08qhzck271anrx9y6qa6mh8hwwdzsgwld8q0000rcd7yvvpnjr3c"; type = "gem"; }; - version = "2.19.0"; + version = "2.19.1"; }; lookbook = { dependencies = ["actioncable" "activemodel" "css_parser" "htmlbeautifier" "htmlentities" "listen" "railties" "redcarpet" "rouge" "view_component" "yard" "zeitwerk"]; @@ -3234,6 +3263,16 @@ }; version = "2.7.1"; }; + mail-smtp_pool = { + dependencies = ["connection_pool" "mail"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/vendor/gems/mail-smtp_pool"; + type = "path"; + }; + version = "0.1.0"; + }; marcel = { groups = ["default" "test"]; platforms = []; @@ -3289,6 +3328,16 @@ }; version = "1.0.0"; }; + microsoft_graph_mailer = { + dependencies = ["mail" "oauth2"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/vendor/gems/microsoft_graph_mailer"; + type = "path"; + }; + version = "0.1.0"; + }; mime-types = { dependencies = ["mime-types-data"]; groups = ["danger" "default" "development" "test"]; @@ -3604,10 +3653,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cam1455nmi3fzzpa9ixn2hsim10fbprmj62ajpd6d02mwdprwwn"; + sha256 = "0n79k78c5vdcyl0m3y3l5x9kxl6xf5lgriwi2vd665qmdkr01vnk"; type = "gem"; }; - version = "1.13.9"; + version = "1.13.10"; }; notiffany = { dependencies = ["nenv" "shellany"]; @@ -3760,6 +3809,26 @@ }; version = "2.0.0"; }; + omniauth-azure-oauth2 = { + dependencies = ["jwt" "omniauth" "omniauth-oauth2"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/vendor/gems/omniauth-azure-oauth2"; + type = "path"; + }; + version = "0.0.10"; + }; + omniauth-cas3 = { + dependencies = ["addressable" "nokogiri" "omniauth"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/vendor/gems/omniauth-cas3"; + type = "path"; + }; + version = "1.1.4"; + }; omniauth-dingtalk-oauth2 = { dependencies = ["omniauth-oauth2"]; groups = ["default"]; @@ -3793,6 +3862,16 @@ }; version = "2.0.1"; }; + omniauth-gitlab = { + dependencies = ["omniauth" "omniauth-oauth2"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/vendor/gems/omniauth-gitlab"; + type = "path"; + }; + version = "4.0.0"; + }; omniauth-google-oauth2 = { dependencies = ["jwt" "oauth2" "omniauth" "omniauth-oauth2"]; groups = ["default"]; @@ -3837,6 +3916,16 @@ }; version = "0.2.8"; }; + omniauth-salesforce = { + dependencies = ["omniauth" "omniauth-oauth2"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/vendor/gems/omniauth-salesforce"; + type = "path"; + }; + version = "1.0.5"; + }; omniauth-saml = { dependencies = ["omniauth" "ruby-saml"]; groups = ["default"]; @@ -3870,6 +3959,16 @@ }; version = "1.4.0"; }; + omniauth_crowd = { + dependencies = ["activesupport" "nokogiri" "omniauth"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/vendor/gems/omniauth_crowd"; + type = "path"; + }; + version = "2.4.0"; + }; open4 = { groups = ["default" "development"]; platforms = []; @@ -3897,10 +3996,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wkx3b598mxmr3idfbgas0cnrds54bfivnn1ip0d7z7kcr5vzbzn"; + sha256 = "0xx01in25q31rpxmq2qlimi44zarsp4px7046xnc6in0pa127xsk"; type = "gem"; }; - version = "2.2.1"; + version = "2.2.2"; }; openssl-signature_algorithm = { groups = ["default"]; @@ -4012,10 +4111,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q31n7yj59wka8xl8s5wkf66hm4pgvblx95czyxffprdnlhrir2p"; + sha256 = "17qfhjvnr9q2gp1gfdl6kndy2mb6qdwsls3vnjhb1h8ddimdm4s5"; type = "gem"; }; - version = "3.1.2.1"; + version = "3.1.3.0"; }; parslet = { groups = ["default" "development" "test"]; @@ -4139,10 +4238,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r8iaviqw0bjp83364k04n5kyzvr0hawf3h5xlgjsg30vmpykrrn"; + sha256 = "095gq9sr6pab1jzbvn3pjs7i1p5hnlasnhvq2xdfsvxjyw33fvbn"; type = "gem"; }; - version = "0.16.2"; + version = "0.17.0"; }; pry = { dependencies = ["coderay" "method_source"]; @@ -4249,10 +4348,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d"; + sha256 = "0p685i23lr8pl7l09g9l2mcj615fr7g33w3mkcr472lcg34nq8n8"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.1"; }; rack = { groups = ["default" "development" "test"]; @@ -4877,10 +4976,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b7zc3gissn5ki7zz2szg1mlxn8zqhgb3bdv96cl25w4mgf4g3in"; + sha256 = "1fhyia6fw438ld83vz7vx37zynmzv042saf04ir43ga6sxk4m9k4"; type = "gem"; }; - version = "1.36.0"; + version = "1.38.0"; }; rubocop-ast = { dependencies = ["parser"]; @@ -4888,10 +4987,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s4m9h9hzrpfmsnswvfimafmjwfa79cbqh9dvq18cja32dhrhpcg"; + sha256 = "1qiq3q66w57im0ryrvnd1yq0g2s2safhywpv94441kvc1amayjzy"; type = "gem"; }; - version = "1.21.0"; + version = "1.23.0"; }; rubocop-gitlab-security = { dependencies = ["rubocop"]; @@ -4910,10 +5009,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bdxal5n0q6aq457jz60jzhs3z04mv2wbvl5xd2cw3lrr6x2q3xl"; + sha256 = "1669dfwhnfkmz7yz7fl5bhhsdwxivnh2zkp260my7w4yzfckki7i"; type = "gem"; }; - version = "0.14.6"; + version = "0.18.0"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -4921,10 +5020,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l87hrzjch2mdpwi0wf9b5nci7fmz5pfzqn5v44zi3rq80zawigf"; + sha256 = "1h06a2asg8pjq7l0k885126n60y54rgw0qr957qarpv7qligzn4c"; type = "gem"; }; - version = "1.14.3"; + version = "1.15.0"; }; rubocop-rails = { dependencies = ["activesupport" "rack" "rubocop"]; @@ -4932,10 +5031,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g342zj7b01z3l8k9hsvx0x2qyp74a59qz6j3a26pwzalr3ap48q"; + sha256 = "052viwgi7dbbnq0pxihz1k72dwhph8gw4v2zzw057w42l39hhh6i"; type = "gem"; }; - version = "2.15.2"; + version = "2.17.2"; }; rubocop-rspec = { dependencies = ["rubocop"]; @@ -4943,10 +5042,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y93hhhcs2j7z8gz8xagwwjs243rskryx4fm62piq9i58lnx4y4j"; + sha256 = "0pj53m5zcrgyhb2zsjxqsav9sm9s8jh0mgk8c1qckaxy3dkwfxm4"; type = "gem"; }; - version = "2.12.1"; + version = "2.15.0"; }; ruby-fogbugz = { dependencies = ["crack" "multipart-post"]; @@ -5154,10 +5253,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qx6hwi10s0ir46l3aq4lspkxlcs1x4cjhvdhpdxyxaicciqddi2"; + sha256 = "0c9imnjbakx25r2n7widfp00s19ndzmmwax761mx5vbwm9nariyb"; type = "gem"; }; - version = "0.1.0"; + version = "0.1.1"; }; securecompare = { groups = ["default"]; @@ -5434,15 +5533,14 @@ version = "2.0.0"; }; snowplow-tracker = { - dependencies = ["contracts"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05136477ifa567aym9k8nqqmwv3plbczgh9x9fbz86860vym5v4w"; + sha256 = "0f2afcmwbfxfrkf0scc5yi3x5lyrfbd3xri8zm2ri0is8kqz99kv"; type = "gem"; }; - version = "0.6.1"; + version = "0.8.0"; }; solargraph = { dependencies = ["backport" "benchmark" "diff-lcs" "e2mmap" "jaro_winkler" "kramdown" "kramdown-parser-gfm" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"]; @@ -5482,10 +5580,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x2wz1y2b0kp7mlk9k8zkl39rddk2l3x34b7dar3bh3axd1cs30d"; + sha256 = "1jx3y1krmx7flrp8fldb354cap1xxlln4yl97ik8smfzn07hhzzi"; type = "gem"; }; - version = "2.1.1"; + version = "4.1.0"; }; spring-commands-rspec = { dependencies = ["spring"]; @@ -5720,14 +5818,14 @@ }; terminal-table = { dependencies = ["unicode-display_width"]; - groups = ["default" "development"]; + groups = ["danger" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk"; + sha256 = "14dfmfjppmng5hwj7c5ka6qdapawm3h6k9lhn8zj001ybypvclgr"; type = "gem"; }; - version = "1.8.0"; + version = "3.0.2"; }; terser = { dependencies = ["execjs"]; @@ -5801,16 +5899,6 @@ }; version = "2.0.11"; }; - timecop = { - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0d7mm786180v4kzvn1f77rhfppsg5n0sq2bdx63x9nv114zm8jrp"; - type = "gem"; - }; - version = "0.9.1"; - }; timeliness = { groups = ["default"]; platforms = []; @@ -6154,10 +6242,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hbdw3vh856f5yg5mbj4498l6vh90cd3pn22ikr3ranzkrh73l3s"; + sha256 = "1np1xy15xq5lcp0y5zr7sxnpwwgcq7bvfs6jc27vnkw0lfhz4ir1"; type = "gem"; }; - version = "2.2.4"; + version = "2.3.0"; }; view_component = { dependencies = ["activesupport" "concurrent-ruby" "method_source"]; @@ -6353,9 +6441,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xjdr2szxvn3zb1sb5l8nfd6k9jr3b4qqbbg1mj9grf68m3fxckc"; + sha256 = "09pqhdi6q4sqv0p1gnjpbcy4az0yv8hrpykjngdgh9qiqd87nfdv"; type = "gem"; }; - version = "2.6.0"; + version = "2.6.6"; }; } diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index 0f322a5d375e..266ca3e4cebd 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -15,22 +15,6 @@ from typing import Iterable import requests -# Always keep this in sync with the GitLaab version you're updating to. -# If you see any errors about vendored dependencies during an update, check the Gemfile. -VENDORED_GEMS = [ - "bundler-checksum", - "devise-pbkdf2-encryptable", - "omniauth-azure-oauth2", - "omniauth-cas3", - "omniauth-gitlab", - "omniauth_crowd", - "omniauth-salesforce", - "attr_encrypted", - "mail-smtp_pool", - "microsoft_graph_mailer", - "ipynbdiff", - "error_tracking_open_api", -] logger = logging.getLogger(__name__) @@ -101,8 +85,7 @@ class GitLabRepo: owner=self.owner, repo=self.repo, rev=rev, - passthru=passthru, - vendored_gems=VENDORED_GEMS) + passthru=passthru) def _get_data_json(): @@ -155,30 +138,25 @@ def update_rubyenv(): # load rev from data.json data = _get_data_json() rev = data['rev'] + version = data['version'] - gemfile = repo.get_file('Gemfile', rev) - gemfile_lock = repo.get_file('Gemfile.lock', rev) + for fn in ['Gemfile.lock', 'Gemfile']: + with open(rubyenv_dir / fn, 'w') as f: + f.write(repo.get_file(fn, rev)) - with open(rubyenv_dir / 'Gemfile', 'w') as f: - f.write(re.sub(f'.*({"|".join(VENDORED_GEMS)}).*', "", gemfile)) + # Fetch vendored dependencies temporarily in order to build the gemset.nix + subprocess.check_output(['mkdir', '-p', 'vendor/gems'], cwd=rubyenv_dir) + 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=vendor/gems | tar -xj --strip-components=3'], cwd=f'{rubyenv_dir}/vendor/gems') - with open(rubyenv_dir / 'Gemfile.lock', 'w') as f: - f.write(gemfile_lock) + # Undo our gemset.nix patches so that bundix runs through + subprocess.check_output(['sed', '-i', '-e', '1d', '-e', 's:\\${src}/::g' , 'gemset.nix'], cwd=rubyenv_dir) subprocess.check_output(['bundle', 'lock'], cwd=rubyenv_dir) subprocess.check_output(['bundix'], cwd=rubyenv_dir) - with open(rubyenv_dir / 'Gemfile', 'w') as f: - for gem in VENDORED_GEMS: - gemfile = gemfile.replace(f'path: \'vendor/gems/{gem}\'', f'path: \'{gem}\'') + subprocess.check_output(['sed', '-i', '-e', '1i\\src:', '-e', 's:path = \\(vendor/[^;]*\\);:path = "${src}/\\1";:g', 'gemset.nix'], cwd=rubyenv_dir) + subprocess.check_output(['rm', '-rf', 'vendor'], cwd=rubyenv_dir) - f.write(gemfile) - - with open(rubyenv_dir / 'Gemfile.lock', 'w') as f: - for gem in VENDORED_GEMS: - gemfile_lock = gemfile_lock.replace(f'remote: vendor/gems/{gem}', f'remote: {gem}') - - f.write(gemfile_lock) @cli.command('update-gitaly')