diff options
Diffstat (limited to 'pkgs')
13 files changed, 869 insertions, 755 deletions
diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 693b7adf46b..dafea4640cb 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "15.4.4", - "repo_hash": "sha256-iIgN1j02Lr/RtNeopqs6ndFqw8YIU2F6c49RGWvpmgc=", - "yarn_hash": "1r33qrvwf2wmq5c1d2awk9qhk9nzvafqn3drdvnczfv43sda4lg8", + "version": "15.6.0", + "repo_hash": "sha256-7Pjksu1l2QfhpYieEGB9coypSt/0iMfptCa69Iaoe3s=", + "yarn_hash": "0lgl8rs9mlrwpzq75rywdbjbiib17wxvzlv1jibnx66iw1ym2rvh", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v15.4.4-ee", + "rev": "v15.6.0-ee", "passthru": { - "GITALY_SERVER_VERSION": "15.4.4", - "GITLAB_PAGES_VERSION": "1.62.0", - "GITLAB_SHELL_VERSION": "14.10.0", - "GITLAB_WORKHORSE_VERSION": "15.4.4" + "GITALY_SERVER_VERSION": "15.6.0", + "GITLAB_PAGES_VERSION": "1.63.0", + "GITLAB_SHELL_VERSION": "14.13.0", + "GITLAB_WORKHORSE_VERSION": "15.6.0" }, "vendored_gems": [ "bundler-checksum", @@ -17,9 +17,9 @@ "omniauth-azure-oauth2", "omniauth-cas3", "omniauth-gitlab", - "omniauth-google-oauth2", "omniauth_crowd", "omniauth-salesforce", + "attr_encrypted", "mail-smtp_pool", "microsoft_graph_mailer", "ipynbdiff", diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 88f2a5f4cd0..2ed65c59901 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -108,7 +108,7 @@ let bundle exec rake gettext:po_to_json RAILS_ENV=production NODE_ENV=production bundle exec rake rake:assets:precompile RAILS_ENV=production NODE_ENV=production - bundle exec rake gitlab:assets:compile_webpack_if_needed RAILS_ENV=production NODE_ENV=production + bundle exec rake gitlab:assets:compile RAILS_ENV=production NODE_ENV=production bundle exec rake gitlab:assets:fix_urls RAILS_ENV=production NODE_ENV=production bundle exec rake gitlab:assets:check_page_bundle_mixins_css_for_sideeffects RAILS_ENV=production NODE_ENV=production @@ -137,9 +137,6 @@ stdenv.mkDerivation { patches = [ # Change hardcoded paths to the NixOS equivalent ./remove-hardcoded-locations.patch - - # Bump pg to 1.4.3 (see https://github.com/NixOS/nixpkgs/pull/187946) - ./update-pg.patch ]; postPatch = '' diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile index 7fa9b5b307b..5c9feca5ceb 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -4,22 +4,27 @@ 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 'rdoc', '~> 6.0' -gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.2', require: false -gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false gem 'grpc', '~> 1.42.0' # keep in lock-step with grpc-tools gem 'sentry-raven', '~> 3.0', require: false -gem 'faraday', '~> 1.0' gem 'rbtrace', require: false +# The Gitaly Gem contains the Protobuf and gRPC definitions required by the +# Ruby sidecar. +gem 'gitaly', '~> 15.5.0' + # Labkit provides observability functionality -gem 'gitlab-labkit', '~> 0.24' +gem 'gitlab-labkit', '~> 0.28' # 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.0' +gem 'google-protobuf', '~> 3.21.9' + +# 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 +# dependency and can thus be removed when the version constraint is gone. +gem 'redis', '~> 4.8.0' group :development, :test do gem 'rubocop', '~> 0.69', require: false @@ -28,8 +33,6 @@ group :development, :test do gem 'timecop', require: false gem 'factory_bot', require: false gem 'pry', '~> 0.12.2', require: false - - gem 'grpc-tools', '~> 1.42.0' end # Gems required in omnibus-gitlab pipeline diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index 616dabbe088..85f0f5c03d1 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -46,33 +46,21 @@ GEM faraday (1.0.1) multipart-post (>= 1.2, < 3) ffi (1.15.5) - gemojione (3.3.0) - json + 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) - github-markup (1.7.0) - gitlab-gollum-lib (4.2.7.10.gitlab.2) - gemojione (~> 3.2) - github-markup (~> 1.6) - gitlab-gollum-rugged_adapter (~> 0.4.4.4.gitlab.1) - nokogiri (>= 1.6.1, < 2.0) - rouge (~> 3.1) - sanitize (~> 6.0) - stringex (~> 2.6) - gitlab-gollum-rugged_adapter (0.4.4.4.gitlab.1) - mime-types (>= 1.15) - rugged (~> 1.0) - gitlab-labkit (0.24.0) + gitlab-labkit (0.28.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 (~> 2.1) - redis (> 3.0.0, < 5.0.0) + redis (> 3.0.0, < 6.0.0) gitlab-license_finder (6.14.2.1) bundler rubyzip (>= 1, < 3) @@ -81,35 +69,30 @@ GEM with_env (= 1.1.0) xml-simple (~> 1.1.5) gitlab-markup (1.7.1) - google-protobuf (3.21.5) + google-protobuf (3.21.9) googleapis-common-protos-types (1.4.0) google-protobuf (~> 3.14) grpc (1.42.0) google-protobuf (~> 3.18) googleapis-common-protos-types (~> 1.0) - grpc-tools (1.42.0) i18n (1.12.0) concurrent-ruby (~> 1.0) ice_nine (0.11.2) jaeger-client (1.1.0) opentracing (~> 0.3) thrift - json (2.5.1) licensee (9.15.2) dotenv (~> 2.0) octokit (~> 4.20) reverse_markdown (~> 1.0) rugged (>= 0.24, < 2.0) thor (>= 0.19, < 2.0) - loofah (2.18.0) + loofah (2.19.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) method_source (0.9.2) - mime-types (3.3.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2020.1104) mini_mime (1.1.2) mini_portile2 (2.8.0) minitest (5.16.3) @@ -126,7 +109,7 @@ GEM parallel (1.19.2) parser (3.0.3.2) ast (~> 2.4.1) - pg_query (2.1.3) + pg_query (2.2.0) google-protobuf (>= 3.19.2) proc_to_ast (0.1.0) coderay @@ -151,13 +134,11 @@ GEM ffi (>= 1.0.6) msgpack (>= 0.4.3) optimist (>= 3.0.0) - rdoc (6.3.2) redis (4.8.0) regexp_parser (1.8.1) reverse_markdown (1.4.0) nokogiri rexml (3.2.5) - rouge (3.30.0) rspec (3.8.0) rspec-core (~> 3.8.0) rspec-expectations (~> 3.8.0) @@ -191,18 +172,14 @@ GEM ruby-progressbar (1.10.1) rubyzip (2.3.2) rugged (1.2.0) - sanitize (6.0.0) - crass (~> 1.0.2) - nokogiri (>= 1.12.0) sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) sentry-raven (3.0.4) faraday (>= 1.0) - stringex (2.8.5) thor (1.1.0) thread_safe (0.3.6) - thrift (0.16.0) + thrift (0.17.0) timecop (0.9.1) tomlrb (2.0.1) tzinfo (2.0.5) @@ -227,20 +204,17 @@ PLATFORMS DEPENDENCIES activesupport (~> 6.1.6.1) factory_bot - faraday (~> 1.0) + gitaly (~> 15.5.0) github-linguist (~> 7.20.0) - gitlab-gollum-lib (~> 4.2.7.10.gitlab.2) - gitlab-gollum-rugged_adapter (~> 0.4.4.4.gitlab.1) - gitlab-labkit (~> 0.24) + gitlab-labkit (~> 0.28) gitlab-license_finder gitlab-markup (~> 1.7.1) - google-protobuf (~> 3.21.0) + google-protobuf (~> 3.21.9) grpc (~> 1.42.0) - grpc-tools (~> 1.42.0) licensee (~> 9.15) pry (~> 0.12.2) rbtrace - rdoc (~> 6.0) + redis (~> 4.8.0) rspec rspec-parameterized rubocop (~> 0.69) @@ -249,4 +223,4 @@ DEPENDENCIES timecop BUNDLED WITH - 2.3.15 + 2.3.24 diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 44a8218e1fb..fcd50548221 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitLab, fetchFromGitHub, buildGoModule, ruby , bundlerEnv, pkg-config # libgit2 + dependencies -, libgit2_1_3_0, openssl, zlib, pcre, http-parser }: +, libgit2, openssl, zlib, pcre, http-parser }: let rubyEnv = bundlerEnv rec { @@ -11,7 +11,7 @@ let gemdir = ./.; }; - version = "15.4.4"; + version = "15.6.0"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -22,17 +22,17 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-b8ChQYaj+7snlrLP4P9FIUSIq/SNMh9hFlFajOPcBEU="; + sha256 = "sha256-MQFvDSQhmlCz+ox9TFFEd+q2beDUXYVhIyEWWnxn7r0="; }; - vendorSha256 = "sha256-CUFYHjmOfosM3mfw0qEY+AQcR8U3J/1lU2Ml6wSZ/QM="; + vendorSha256 = "sha256-SEPfso27PHHpvnQwdeMQYECw/CZIa/NdpMBSTRJEwIo="; ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ]; tags = [ "static,system_libgit2" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ rubyEnv.wrappedRuby libgit2_1_3_0 openssl zlib pcre http-parser ]; + buildInputs = [ rubyEnv.wrappedRuby libgit2 openssl zlib pcre http-parser ]; doCheck = false; }; @@ -59,7 +59,7 @@ buildGoModule ({ postInstall = '' mkdir -p $ruby - cp -rv $src/ruby/{bin,lib,proto} $ruby + cp -rv $src/ruby/{bin,lib} $ruby ''; outputs = [ "out" "ruby" ]; diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index 9051ad74bf1..a36e88e0866 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -215,14 +215,16 @@ }; version = "1.15.5"; }; - gemojione = { - dependencies = ["json"]; + gitaly = { + dependencies = ["grpc"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ayk8r147k1s38nj18pwk76npx1p7jhi86silk800nj913pjvrhj"; + sha256 = "0hpgljz05rhik15z081ghxw9pw83vz78p12wjdgxj3qz1a4x8pfq"; type = "gem"; }; - version = "3.3.0"; + version = "15.5.0"; }; github-linguist = { dependencies = ["charlock_holmes" "escape_utils" "mini_mime" "rugged"]; @@ -235,46 +237,16 @@ }; version = "7.20.0"; }; - github-markup = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17g6g18gdjg63k75sfwiskjzl9i0hfcnrkcpb4fwrnb20v3jgswp"; - type = "gem"; - }; - version = "1.7.0"; - }; - gitlab-gollum-lib = { - dependencies = ["gemojione" "github-markup" "gitlab-gollum-rugged_adapter" "nokogiri" "rouge" "sanitize" "stringex"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vs6frgnhhfnyicsjck39xibmn7xc6ji7wvznvfmr53f4smqjk40"; - type = "gem"; - }; - version = "4.2.7.10.gitlab.2"; - }; - gitlab-gollum-rugged_adapter = { - dependencies = ["mime-types" "rugged"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0gvgqfn05swsazfxdwmlqcq8v2pjyy7dmyl3bd8b8jrrxbpmpxxg"; - type = "gem"; - }; - version = "0.4.4.4.gitlab.1"; - }; gitlab-labkit = { dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j0598m9445msa0rksl1l1cvd11wsnyq1s4gjmcbw18a9smfa5lg"; + sha256 = "0m2n5lvnm5nxn7bc6bqm3ycwk47kck6nl1c0s83pcvsn6qizbsx7"; type = "gem"; }; - version = "0.24.0"; + version = "0.28.0"; }; gitlab-license_finder = { dependencies = ["rubyzip" "thor" "tomlrb" "with_env" "xml-simple"]; @@ -302,10 +274,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ysvm5mxx1knjp3sbhi18nswaml625vbgm3gbh7is14h4d8fwjy9"; + sha256 = "1p4aa5nnkkrdd3v3i57092vj2agj7ih3zavymw451j52k8anqras"; type = "gem"; }; - version = "3.21.5"; + version = "3.21.9"; }; googleapis-common-protos-types = { dependencies = ["google-protobuf"]; @@ -329,16 +301,6 @@ }; version = "1.42.0"; }; - grpc-tools = { - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0xipvw8zcm1c3pna6fgmy83x0yvffii8d7wafwcxmszxa647brw1"; - type = "gem"; - }; - version = "1.42.0"; - }; i18n = { dependencies = ["concurrent-ruby"]; groups = ["default" "development" "test"]; @@ -369,16 +331,6 @@ }; version = "1.1.0"; }; - json = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci"; - type = "gem"; - }; - version = "2.5.1"; - }; licensee = { dependencies = ["dotenv" "octokit" "reverse_markdown" "rugged" "thor"]; groups = ["default"]; @@ -396,10 +348,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18ymp6l3bv7abz07k6qbbi9c9vsiahq30d2smh4qzsvag8j5m5v1"; + sha256 = "1fpyk1965py77al7iadkn5dibwgvybknkr7r8bii2dj73wvr29rh"; type = "gem"; }; - version = "2.18.0"; + version = "2.19.0"; }; memoizable = { dependencies = ["thread_safe"]; @@ -418,27 +370,6 @@ }; version = "0.9.2"; }; - mime-types = { - dependencies = ["mime-types-data"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh"; - type = "gem"; - }; - version = "3.3.1"; - }; - mime-types-data = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ipjyfwn9nlvpcl8knq3jk4g5f12cflwdbaiqxcq1s7vwfwfxcag"; - type = "gem"; - }; - version = "3.2020.1104"; - }; mini_mime = { groups = ["default"]; platforms = []; @@ -558,10 +489,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00bhwkhjy6bkp04313m5il7vd165i3fz0x4jissflf66i164ppgk"; + sha256 = "0l79y41nwwacabj61jkbh4r7haajaf8y4bn5pihh0m1g8547b8w4"; type = "gem"; }; - version = "2.1.3"; + version = "2.2.0"; }; proc_to_ast = { dependencies = ["coderay" "parser" "unparser"]; @@ -671,16 +602,6 @@ }; version = "0.4.14"; }; - rdoc = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "19h5g3g7k7wggy9amfx8b3m09ss7wrakbrva2xnda9sw4chagx6y"; - type = "gem"; - }; - version = "6.3.2"; - }; redis = { groups = ["default"]; platforms = []; @@ -722,16 +643,6 @@ }; version = "3.2.5"; }; - rouge = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1dnfkrk8xx2m8r3r9m2p5xcq57viznyc09k7r3i4jbm758i57lx3"; - type = "gem"; - }; - version = "3.30.0"; - }; rspec = { dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; groups = ["development" "test"]; @@ -849,17 +760,6 @@ }; version = "1.2.0"; }; - sanitize = { - dependencies = ["crass" "nokogiri"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zq8pxmsd1abw18zz6mazsm2jfpwmbgdxbpawb7bmwvkb2c5yyc1"; - type = "gem"; - }; - version = "6.0.0"; - }; sawyer = { dependencies = ["addressable" "faraday"]; groups = ["default"]; @@ -882,16 +782,6 @@ }; version = "3.0.4"; }; - stringex = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15ns7j5smw04w6w7bqd5mm2qcl7w9lhwykyb974i4isgg9yc23ys"; - type = "gem"; - }; - version = "2.8.5"; - }; thor = { groups = ["default"]; platforms = []; @@ -915,10 +805,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1knw2xa3pkfql4np9qazz2mdi1vz21vdsa0wkx648c4ym1p2h8yh"; + sha256 = "12p856z7inf47azpvh9qswsfx8035r5hbzlg2x5n8z2sjqzjkk80"; type = "gem"; }; - version = "0.16.0"; + version = "0.17.0"; }; timecop = { source = { diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 2694be2f65b..535d4faa13a 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.10.0"; + version = "14.13.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-7uy7F4wK/4xz0PK9ZadaMjy3c+xUK9+YKaaEm5iFqUs="; + sha256 = "sha256-KN1twfuamRsG5/jan4Frhd4LXOU9Bp5Htex+TsTc+Is="; }; buildInputs = [ ruby ]; patches = [ ./remove-hardcoded-locations.patch ]; - vendorSha256 = "sha256-urS0FED636APQe5uNvhDvWsnZtHCW60VtRE1B7IzGZQ="; + vendorSha256 = "sha256-CAadjiZCopjGNxQTJbvs56THtAve92ewiFLjGTY2/9E="; 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 2042b6c2bce..1dedab8cb07 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.4.4"; + version = "15.6.0"; src = fetchFromGitLab { owner = data.owner; @@ -16,7 +16,7 @@ buildGoModule rec { sourceRoot = "source/workhorse"; - vendorSha256 = "sha256-dN3DfkAJkqkmGyahsBDsPQBog52RGECV+SESSR6W3fg="; + vendorSha256 = "sha256-VqJqyRRFmDugq0VG7gPBxllikVNv5et93jJHleSTS7M="; 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 0426bd84020..57d7e83750f 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -2,30 +2,48 @@ source 'https://rubygems.org' +if ENV['BUNDLER_CHECKSUM_VERIFICATION_OPT_IN'] # this verification is still experimental + $LOAD_PATH.unshift(File.expand_path("vendor/gems/bundler-checksum/lib", __dir__)) + require 'bundler-checksum' + Bundler::Checksum.patch! +end + gem 'bundler-checksum', '~> 0.1.0', path: '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 +# Pin openssl to match the version bundled with our supported Rubies. +# See https://stdgems.org/openssl/#gem-version. +gem 'openssl', '2.2.1' +# 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. +# See https://gitlab.com/gitlab-org/gitlab/-/issues/376417 +gem 'ipaddr', '1.2.2' + # Responders respond_to and respond_with gem 'responders', '~> 3.0' gem 'sprockets', '~> 3.7.0' -gem 'view_component', '~> 2.71.0' +gem 'view_component', '~> 2.74.1' # Default values for AR models gem 'default_value_for', '~> 3.4.0' # Supported DBs -gem 'pg', '~> 1.4.0' +gem 'pg', '~> 1.4.3' gem 'rugged', '~> 1.2' gem 'grape-path-helpers', '~> 1.7.1' gem 'faraday', '~> 1.0' -gem 'marginalia', '~> 1.10.0' +gem 'marginalia', '~> 1.11.1' # Authorization gem 'declarative_policy', '~> 1.1.0' @@ -38,18 +56,17 @@ gem 'doorkeeper', '~> 5.5.0.rc2' gem 'doorkeeper-openid_connect', '~> 1.7.5' gem 'rexml', '~> 3.2.5' gem 'ruby-saml', '~> 1.13.0' -gem 'omniauth-rails_csrf_protection' gem 'omniauth', '~> 2.1.0' gem 'omniauth-auth0', '~> 2.0.0' -gem 'omniauth-azure-activedirectory-v2', '~> 1.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-dingtalk-oauth2', '~> 1.0' -gem 'omniauth-alicloud', '~> 1.0.1' +gem 'omniauth-alicloud', '~> 2.0.0' gem 'omniauth-facebook', '~> 4.0.0' -gem 'omniauth-github', '2.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-google-oauth2', '~> 1.0.1', path: 'omniauth-google-oauth2' # See gem 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' @@ -59,7 +76,7 @@ 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-atlassian-oauth2', '~> 0.2.0' -gem 'rack-oauth2', '~> 1.21.2' +gem 'rack-oauth2', '~> 1.21.3' gem 'jwt', '~> 2.1.0' # Kerberos authentication. EE-only @@ -69,12 +86,12 @@ gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos # Spam and anti-bot protection gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails' gem 'akismet', '~> 3.0' -gem 'invisible_captcha', '~> 1.1.0' +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.1.0' +gem 'attr_encrypted', '~> 3.2.4', path: 'attr_encrypted' gem 'u2f', '~> 0.2.1' # GitLab Pages @@ -84,7 +101,7 @@ gem 'rubyzip', '~> 2.3.2', require: 'zip' gem 'acme-client', '~> 2.0' # Browser detection -gem 'browser', '~> 4.2' +gem 'browser', '~> 5.3.1' # OS detection for usage ping gem 'ohai', '~> 16.10' @@ -101,7 +118,9 @@ gem 'net-ldap', '~> 0.16.3' # API gem 'grape', '~> 1.5.2' gem 'grape-entity', '~> 0.10.0' -gem 'rack-cors', '~> 1.1.0', require: 'rack/cors' +gem 'rack-cors', '~> 1.1.1', require: 'rack/cors' +gem 'grape-swagger', '~>1.5.0', group: [:development, :test] +gem 'grape-swagger-entity', '~> 0.5.1', group: [:development, :test] # GraphQL API gem 'graphql', '~> 1.13.12' @@ -110,12 +129,10 @@ 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) -gem 'hashie' -# Disable strong_params so that Mash does not respond to :permitted? -gem 'hashie-forbidden_attributes' +gem 'hashie', '~> 5.0.0' # Pagination -gem 'kaminari', '~> 1.0' +gem 'kaminari', '~> 1.2.2' # HAML gem 'hamlit', '~> 2.15.0' @@ -125,16 +142,16 @@ gem 'carrierwave', '~> 1.3' gem 'mini_magick', '~> 4.10.1' # for backups -gem 'fog-aws', '~> 3.14' +gem 'fog-aws', '~> 3.15' # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. # Also see config/initializers/fog_core_patch.rb. gem 'fog-core', '= 2.1.0' -gem 'fog-google', '~> 1.15', require: 'fog/google' -gem 'fog-local', '~> 0.6' +gem 'fog-google', '~> 1.19', require: 'fog/google' +gem 'fog-local', '~> 0.8' gem 'fog-openstack', '~> 1.0' gem 'fog-rackspace', '~> 0.1.1' gem 'fog-aliyun', '~> 0.3' -gem 'gitlab-fog-azure-rm', '~> 1.3.0', require: 'fog/azurerm' +gem 'gitlab-fog-azure-rm', '~> 1.4.0', require: 'fog/azurerm' # for Google storage gem 'google-api-client', '~> 0.33' @@ -149,18 +166,17 @@ 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.131.0' +gem 'aws-sdk-core', '~> 3.167.0' gem 'aws-sdk-cloudformation', '~> 1' -gem 'aws-sdk-s3', '~> 1.114.0' +gem 'aws-sdk-s3', '~> 1.117.1' gem 'faraday_middleware-aws-sigv4', '~>0.3.0' gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections # Markdown and HTML processing -gem 'html-pipeline', '~> 2.13.2' -gem 'deckar01-task_list', '2.3.1' -gem 'gitlab-markup', '~> 1.8.0' -gem 'github-markup', '~> 1.7.0', require: 'github/markup' -gem 'commonmarker', '~> 0.23.4' +gem 'html-pipeline', '~> 2.14.3' +gem 'deckar01-task_list', '2.3.2' +gem 'gitlab-markup', '~> 1.8.0', require: 'github/markup' +gem 'commonmarker', '~> 0.23.6' gem 'kramdown', '~> 2.3.1' gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~> 6.3.2' @@ -170,12 +186,11 @@ gem 'wikicloth', '0.8.1' gem 'asciidoctor', '~> 2.0.17' gem 'asciidoctor-include-ext', '~> 0.4.0', require: false gem 'asciidoctor-plantuml', '~> 0.0.16' -gem 'asciidoctor-kroki', '~> 0.5.0', require: false +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.8' -gem 'escape_utils', '~> 1.1' +gem 'nokogiri', '~> 1.13.9' # Calendar rendering gem 'icalendar' @@ -187,7 +202,7 @@ gem 'diff_match_patch', '~> 0.1.0' # Application server gem 'rack', '~> 2.2.4' # https://github.com/zombocom/rack-timeout/blob/master/README.md#rails-apps-manually -gem 'rack-timeout', '~> 0.6.0', require: 'rack/timeout/base' +gem 'rack-timeout', '~> 0.6.3', require: 'rack/timeout/base' group :puma do gem 'puma', '~> 5.6.5', require: false @@ -202,16 +217,16 @@ gem 'state_machines-activerecord', '~> 0.8.0' gem 'acts-as-taggable-on', '~> 9.0' # Background jobs -gem 'sidekiq', '~> 6.4.0' -gem 'sidekiq-cron', '~> 1.4.0' -gem 'redis-namespace', '~> 1.8.1' -gem 'gitlab-sidekiq-fetcher', '0.8.0', require: 'sidekiq-reliable-fetch' +gem 'sidekiq', '~> 6.5.7' +gem 'sidekiq-cron', '~> 1.8.0' +gem 'redis-namespace', '~> 1.9.0' +gem 'gitlab-sidekiq-fetcher', '0.9.0', require: 'sidekiq-reliable-fetch' # Cron Parser gem 'fugit', '~> 1.2.1' # HTTP requests -gem 'httparty', '~> 0.16.4' +gem 'httparty', '~> 0.20.0' # Colored output to console gem 'rainbow', '~> 3.0' @@ -223,20 +238,20 @@ gem 'ruby-progressbar', '~> 1.10' gem 'settingslogic', '~> 2.0.9' # Linear-time regex library for untrusted regular expressions -gem 're2', '~> 1.4.0' +gem 're2', '~> 1.6.0' # Misc gem 'version_sorter', '~> 2.2.4' # Export Ruby Regex to Javascript -gem 'js_regex', '~> 3.7' +gem 'js_regex', '~> 3.8' # User agent parsing gem 'device_detector' # Redis -gem 'redis', '~> 4.7.0' +gem 'redis', '~> 4.8.0' gem 'connection_pool', '~> 2.0' # Redis session store @@ -262,7 +277,7 @@ gem 'hangouts-chat', '~> 0.0.5', require: 'hangouts_chat' gem 'asana', '~> 0.10.13' # FogBugz integration -gem 'ruby-fogbugz', '~> 0.2.1' +gem 'ruby-fogbugz', '~> 0.3.0' # Kubernetes integration gem 'kubeclient', '~> 4.9.3' @@ -272,7 +287,7 @@ gem 'sanitize', '~> 6.0' gem 'babosa', '~> 1.0.4' # Sanitizes SVG input -gem 'loofah', '~> 2.18.0' +gem 'loofah', '~> 2.19.0' # Working with license # Detects the open source license the repository includes @@ -292,7 +307,7 @@ gem 'fast_blank' gem 'gitlab-chronic', '~> 0.10.5' gem 'gitlab_chronic_duration', '~> 0.10.6.2' -gem 'rack-proxy', '~> 0.7.2' +gem 'rack-proxy', '~> 0.7.4' gem 'sassc-rails', '~> 2.1.0' gem 'autoprefixer-rails', '10.2.5.1' @@ -301,13 +316,13 @@ gem 'terser', '1.0.2' gem 'addressable', '~> 2.8' gem 'tanuki_emoji', '~> 0.6' gem 'gon', '~> 6.4.0' -gem 'request_store', '~> 1.5' +gem 'request_store', '~> 1.5.1' gem 'base32', '~> 0.3.0' gem 'gitlab-license', '~> 2.2.1' # Protect against bruteforcing -gem 'rack-attack', '~> 6.6.0' +gem 'rack-attack', '~> 6.6.1' # Sentry integration gem 'sentry-raven', '~> 3.1' @@ -317,12 +332,12 @@ gem 'sentry-sidekiq', '~> 5.1.1' # PostgreSQL query parsing # -gem 'pg_query', '~> 2.1.0' +gem 'pg_query', '~> 2.2' gem 'premailer-rails', '~> 1.10.3' # LabKit: Tracing and Correlation -gem 'gitlab-labkit', '~> 0.24.0' +gem 'gitlab-labkit', '~> 0.28.0' gem 'thrift', '>= 0.16.0' # I18n @@ -347,12 +362,12 @@ gem 'prometheus-client-mmap', '~> 0.16', require: 'prometheus/client' gem 'warning', '~> 1.3.0' group :development do - gem 'lefthook', '~> 1.1.1', require: false + gem 'lefthook', '~> 1.2.0', require: false gem 'rubocop' - gem 'solargraph', '~> 0.46.0', require: false + gem 'solargraph', '~> 0.47.2', require: false gem 'letter_opener_web', '~> 2.0.0' - gem 'lookbook', '~> 1.0' + gem 'lookbook', '~> 1.2', '>= 1.2.1' # Better errors handler gem 'better_errors', '~> 2.9.1' @@ -382,7 +397,7 @@ group :development, :test do gem 'spring', '~> 2.1.0' gem 'spring-commands-rspec', '~> 1.0.4' - gem 'gitlab-styles', '~> 8.0.0', require: false + gem 'gitlab-styles', '~> 9.0.0', require: false gem 'haml_lint', '~> 0.40.0', require: false gem 'bundler-audit', '~> 0.7.0.1', require: false @@ -406,11 +421,11 @@ group :development, :test do gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup' - gem 'pact', '~> 1.12' + gem 'pact', '~> 1.63' end group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 3.5.2', require: false + gem 'gitlab-dangerfiles', '~> 3.6.2', require: false end group :development, :test, :coverage do @@ -460,10 +475,9 @@ gem 'gitlab-mail_room', '~> 0.0.9', require: 'mail_room' gem 'email_reply_trimmer', '~> 0.1' gem 'html2text' -gem 'ruby-prof', '~> 1.3.0' gem 'stackprof', '~> 0.2.21', require: false gem 'rbtrace', '~> 0.4', require: false -gem 'memory_profiler', '~> 0.9', require: false +gem 'memory_profiler', '~> 1.0', require: false gem 'activerecord-explain-analyze', '~> 0.1', require: false # OAuth @@ -486,16 +500,16 @@ gem 'ssh_data', '~> 1.3' gem 'spamcheck', '~> 1.0.0' # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 15.4.0-rc2' +gem 'gitaly', '~> 15.5.0' # KAS GRPC protocol definitions gem 'kas-grpc', '~> 0.0.2' gem 'grpc', '~> 1.42.0' -gem 'google-protobuf', '~> 3.21' +gem 'google-protobuf', '~> 3.21', '>= 3.21.9' -gem 'toml-rb', '~> 2.0' +gem 'toml-rb', '~> 2.2.0' # Feature toggles gem 'flipper', '~> 0.25.0' @@ -519,8 +533,6 @@ gem 'retriable', '~> 3.1.2' # LRU cache gem 'lru_redux' -gem 'erubi', '~> 1.9.0' - # Locked as long as quoted-printable encoding issues are not resolved # Monkey-patched in `config/initializers/mail_encoding_patch.rb` # See https://gitlab.com/gitlab-org/gitlab/issues/197386 @@ -539,6 +551,7 @@ gem 'valid_email', '~> 0.1' gem 'json', '~> 2.5.1' gem 'json_schemer', '~> 0.2.18' gem 'oj', '~> 3.13.21' +gem 'oj-introspect', '~> 0.7' gem 'multi_json', '~> 1.14.1' gem 'yajl-ruby', '~> 1.4.3', require: 'yajl' @@ -556,3 +569,15 @@ 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' + +# Vulnerability advisories +gem 'cvss-suite', '~> 3.0.1', require: 'cvss_suite' + +# Work with RPM packages +gem 'arr-pm', '~> 0.0.12' + +# Apple plist parsing +gem 'CFPropertyList' + +# For phone verification +gem 'telesignenterprise', '~> 2.2' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index f1b1f615a09..d75df6327bb 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -1,4 +1,10 @@ PATH + remote: attr_encrypted + specs: + attr_encrypted (3.2.4) + encryptor (~> 3.0.0) + +PATH remote: bundler-checksum specs: bundler-checksum (0.1.0) @@ -9,6 +15,7 @@ PATH specs: devise-pbkdf2-encryptable (0.0.0) devise (~> 4.0) + devise-two-factor (~> 4.0) PATH remote: error_tracking_open_api @@ -58,16 +65,7 @@ PATH specs: omniauth-gitlab (4.0.0) omniauth (~> 2.0) - omniauth-oauth2 (~> 1.7.1) - -PATH - remote: omniauth-google-oauth2 - specs: - omniauth-google-oauth2 (1.0.1) - jwt (>= 2.0) - oauth2 (~> 2.0) - omniauth (~> 2.0) - omniauth-oauth2 (~> 1.7.1) + omniauth-oauth2 (~> 1.8) PATH remote: omniauth-salesforce @@ -87,6 +85,8 @@ PATH GEM remote: https://rubygems.org/ specs: + CFPropertyList (3.0.5) + rexml RedCloth (4.3.2) acme-client (2.0.11) faraday (>= 1.0, < 3.0.0) @@ -155,14 +155,15 @@ GEM zeitwerk (~> 2.3) acts-as-taggable-on (9.0.0) activerecord (>= 6.0, < 7.1) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) aes_key_wrap (1.1.0) akismet (3.0.0) android_key_attestation (0.3.0) apollo_upload_server (2.1.0) actionpack (>= 4.2) graphql (>= 1.8) + arr-pm (0.0.12) asana (0.10.13) faraday (~> 1.0) faraday_middleware (~> 1.0) @@ -171,38 +172,36 @@ GEM asciidoctor (2.0.17) asciidoctor-include-ext (0.4.0) asciidoctor (>= 1.5.6, < 3.0.0) - asciidoctor-kroki (0.5.0) + asciidoctor-kroki (0.7.0) asciidoctor (~> 2.0) asciidoctor-plantuml (0.0.16) asciidoctor (>= 2.0.17, < 3.0.0) ast (2.4.2) atlassian-jwt (0.2.0) jwt (~> 2.1.0) - attr_encrypted (3.1.0) - encryptor (~> 3.0.0) attr_required (1.0.1) autoprefixer-rails (10.2.5.1) execjs (> 0) awesome_print (1.9.2) awrence (1.1.1) aws-eventstream (1.2.0) - aws-partitions (1.600.0) + aws-partitions (1.658.0) aws-sdk-cloudformation (1.41.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.131.1) + aws-sdk-core (3.167.0) aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.525.0) - aws-sigv4 (~> 1.1) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.57.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-kms (1.59.0) + aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.114.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-s3 (1.117.1) + aws-sdk-core (~> 3, >= 3.165.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) - aws-sigv4 (1.5.0) + aws-sigv4 (1.5.1) aws-eventstream (~> 1, >= 1.0.2) azure-storage-blob (2.0.3) azure-storage-common (~> 2.0) @@ -220,22 +219,22 @@ GEM benchmark (0.2.0) benchmark-ips (2.3.0) benchmark-malloc (0.2.0) - benchmark-memory (0.1.2) - memory_profiler (~> 0.9) + benchmark-memory (0.2.0) + memory_profiler (~> 1) benchmark-perf (0.6.0) benchmark-trend (0.4.0) better_errors (2.9.1) coderay (>= 1.0.0) erubi (>= 1.0.0) rack (>= 0.9.0) - bindata (2.4.10) + bindata (2.4.11) binding_ninja (0.2.3) bootsnap (1.13.0) msgpack (~> 1.2) bootstrap_form (4.2.0) actionpack (>= 5.0) activemodel (>= 5.0) - browser (4.2.0) + browser (5.3.1) builder (3.2.4) bullet (7.0.2) activesupport (>= 3.0.0) @@ -282,9 +281,9 @@ GEM open4 (~> 1.3) coderay (1.1.3) colored2 (3.1.2) - commonmarker (0.23.4) + commonmarker (0.23.6) concurrent-ruby (1.1.10) - connection_pool (2.2.5) + connection_pool (2.3.0) contracts (0.11.0) cork (0.3.0) colored2 (~> 3.1) @@ -301,8 +300,9 @@ GEM creole (0.5.0) crystalball (0.7.0) git - css_parser (1.11.0) + css_parser (1.12.0) addressable + cvss-suite (3.0.1) danger (8.6.1) claide (~> 1.0) claide-plugins (>= 0.9.2) @@ -321,7 +321,7 @@ GEM gitlab (~> 4.2, >= 4.2.0) database_cleaner (1.7.0) dead_end (3.1.1) - deckar01-task_list (2.3.1) + deckar01-task_list (2.3.2) html-pipeline declarative (0.0.20) declarative-option (0.1.0) @@ -330,7 +330,7 @@ GEM activerecord (>= 3.2.0, < 7.0) deprecation_toolkit (1.5.1) activesupport (>= 4.2) - derailed_benchmarks (2.1.1) + derailed_benchmarks (2.1.2) benchmark-ips (~> 2) dead_end get_process_mem (~> 0) @@ -412,7 +412,7 @@ GEM launchy (~> 2.1) mail (~> 2.7) encryptor (3.0.0) - erubi (1.9.0) + erubi (1.11.0) escape_utils (1.2.1) et-orbi (1.2.7) tzinfo @@ -420,6 +420,8 @@ GEM ffi (>= 1.15.0) excon (0.90.0) execjs (2.8.1) + expgen (0.1.1) + parslet expression_parser (0.9.0) extended-markdown-filter (0.6.0) html-pipeline (~> 2.0) @@ -446,7 +448,7 @@ GEM faraday-em_http (1.0.0) faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) - faraday-http-cache (2.4.0) + faraday-http-cache (2.4.1) faraday (>= 0.8) faraday-httpclient (1.0.1) faraday-multipart (1.0.4) @@ -490,7 +492,7 @@ GEM fog-json ipaddress (~> 0.8) xml-simple (~> 1.1) - fog-aws (3.14.0) + fog-aws (3.15.0) fog-core (~> 2.1) fog-json (~> 1.1) fog-xml (~> 0.1) @@ -499,16 +501,22 @@ GEM excon (~> 0.58) formatador (~> 0.2) mime-types - fog-google (1.15.0) - fog-core (<= 2.1.0) + fog-google (1.19.0) + fog-core (< 2.3) fog-json (~> 1.2) fog-xml (~> 0.1.0) - google-api-client (>= 0.44.2, < 0.51) + google-apis-compute_v1 (~> 0.14) + google-apis-dns_v1 (~> 0.12) + google-apis-iamcredentials_v1 (~> 0.6) + google-apis-monitoring_v3 (~> 0.12) + google-apis-pubsub_v1 (~> 0.7) + google-apis-sqladmin_v1beta4 (~> 0.13) + google-apis-storage_v1 (~> 0.6) google-cloud-env (~> 1.2) fog-json (1.2.0) fog-core multi_json (~> 1.10) - fog-local (0.6.0) + fog-local (0.8.0) fog-core (>= 1.27, < 3.0) fog-openstack (1.0.8) fog-core (~> 2.1) @@ -531,6 +539,7 @@ GEM ruby-progressbar (~> 1.4) fuzzyurl (0.9.0) gemoji (3.0.1) + gems (1.2.0) get_process_mem (0.2.7) ffi (~> 1.0) gettext (3.3.6) @@ -545,36 +554,35 @@ GEM rails (>= 3.2.0) git (1.11.0) rchardet (~> 1.8) - gitaly (15.4.0.pre.rc2) + gitaly (15.5.0) grpc (~> 1.0) - github-markup (1.7.0) gitlab (4.16.1) httparty (~> 0.14, >= 0.14.0) terminal-table (~> 1.5, >= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-dangerfiles (3.5.2) + gitlab-dangerfiles (3.6.2) 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.3.0) + gitlab-fog-azure-rm (1.4.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.24.0) + gitlab-labkit (0.28.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 (~> 2.1) - redis (> 3.0.0, < 5.0.0) + redis (> 3.0.0, < 6.0.0) gitlab-license (2.2.1) gitlab-mail_room (0.0.9) gitlab-markup (1.8.1) @@ -583,15 +591,16 @@ GEM addressable (~> 2.7) omniauth (>= 1.9, < 3) openid_connect (~> 1.2) - gitlab-sidekiq-fetcher (0.8.0) + gitlab-sidekiq-fetcher (0.9.0) + json (>= 2.5) sidekiq (~> 6.1) - gitlab-styles (8.0.0) - rubocop (~> 0.91, >= 0.91.1) + gitlab-styles (9.0.0) + rubocop (~> 1.36.0) rubocop-gitlab-security (~> 0.1.1) - rubocop-graphql (~> 0.10) - rubocop-performance (~> 1.9.2) - rubocop-rails (~> 2.9) - rubocop-rspec (~> 1.44) + rubocop-graphql (~> 0.14) + rubocop-performance (~> 1.14) + rubocop-rails (~> 2.15) + rubocop-rspec (~> 2.12) gitlab_chronic_duration (0.10.6.2) numerizer (~> 0.2) gitlab_omniauth-ldap (2.2.0) @@ -606,27 +615,52 @@ GEM i18n (>= 0.7) multi_json request_store (>= 1.0) - google-api-client (0.50.0) + google-api-client (0.53.0) + google-apis-core (~> 0.1) + google-apis-generator (~> 0.1) + google-apis-compute_v1 (0.53.0) + google-apis-core (>= 0.9.0, < 2.a) + google-apis-core (0.9.1) addressable (~> 2.5, >= 2.5.1) - googleauth (~> 0.9) - httpclient (>= 2.8.1, < 3.0) + googleauth (>= 0.16.2, < 2.a) + httpclient (>= 2.8.1, < 3.a) mini_mime (~> 1.0) representable (~> 3.0) - retriable (>= 2.0, < 4.0) + retriable (>= 2.0, < 4.a) rexml - signet (~> 0.12) + webrick + google-apis-discovery_v1 (0.12.0) + google-apis-core (>= 0.9.0, < 2.a) + google-apis-dns_v1 (0.28.0) + google-apis-core (>= 0.9.0, < 2.a) + google-apis-generator (0.11.0) + activesupport (>= 5.0) + gems (~> 1.2) + google-apis-core (>= 0.9.1, < 2.a) + google-apis-discovery_v1 (~> 0.5) + thor (>= 0.20, < 2.a) + google-apis-iamcredentials_v1 (0.15.0) + google-apis-core (>= 0.9.0, < 2.a) + google-apis-monitoring_v3 (0.37.0) + google-apis-core (>= 0.9.1, < 2.a) + google-apis-pubsub_v1 (0.30.0) + google-apis-core (>= 0.9.1, < 2.a) + google-apis-sqladmin_v1beta4 (0.38.0) + google-apis-core (>= 0.9.0, < 2.a) + google-apis-storage_v1 (0.20.0) + google-apis-core (>= 0.9.1, < 2.a) google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) - google-protobuf (3.21.5) + google-protobuf (3.21.9) googleapis-common-protos-types (1.3.0) google-protobuf (~> 3.14) - googleauth (0.14.0) - faraday (>= 0.17.3, < 2.0) + googleauth (1.3.0) + faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) - signet (~> 0.14) + signet (>= 0.16, < 2.a) gpgme (2.0.20) mini_portile2 (~> 2.3) grape (1.5.2) @@ -644,6 +678,11 @@ GEM grape (~> 1.3) rake (> 12) ruby2_keywords (~> 0.0.2) + grape-swagger (1.5.0) + grape (~> 1.3) + grape-swagger-entity (0.5.1) + grape-entity (>= 0.6.0) + grape-swagger (>= 1.2.0) grape_logging (1.8.4) grape rack @@ -702,14 +741,12 @@ GEM hana (1.3.7) hangouts-chat (0.0.5) hashdiff (1.0.1) - hashie (4.1.0) - hashie-forbidden_attributes (0.1.1) - hashie (>= 3.0) - health_check (3.0.0) + hashie (5.0.0) + health_check (3.1.0) railties (>= 5.0) heapy (0.2.0) thor - html-pipeline (2.13.2) + html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) html2text (0.2.0) @@ -727,18 +764,21 @@ GEM http-form_data (2.3.0) http-parser (1.2.3) ffi-compiler (>= 1.0, < 2.0) - httparty (0.16.4) + 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) - icalendar (2.4.1) + icalendar (2.8.0) + ice_cube (~> 0.16) + ice_cube (0.16.4) imagen (0.1.8) parser (>= 2.5, != 2.5.1.1) - invisible_captcha (1.1.0) - rails (>= 4.2) + invisible_captcha (2.0.0) + rails (>= 5.0) + ipaddr (1.2.2) ipaddress (0.8.3) jaeger-client (1.1.0) opentracing (~> 0.3) @@ -750,15 +790,16 @@ GEM multipart-post oauth (~> 0.5, >= 0.5.0) jmespath (1.6.1) - js_regex (3.7.0) + js_regex (3.8.0) character_set (~> 1.4) - regexp_parser (~> 2.1) + regexp_parser (~> 2.5) regexp_property_values (~> 1.0) json (2.5.1) - json-jwt (1.13.0) + json-jwt (1.15.3) activesupport (>= 4.2) aes_key_wrap bindata + httpclient json_schemer (0.2.18) ecma-re-validator (~> 0.3) hana (~> 1.3) @@ -767,18 +808,18 @@ GEM jsonpath (1.1.2) multi_json jwt (2.1.0) - kaminari (1.2.1) + kaminari (1.2.2) activesupport (>= 4.1.0) - kaminari-actionview (= 1.2.1) - kaminari-activerecord (= 1.2.1) - kaminari-core (= 1.2.1) - kaminari-actionview (1.2.1) + kaminari-actionview (= 1.2.2) + kaminari-activerecord (= 1.2.2) + kaminari-core (= 1.2.2) + kaminari-actionview (1.2.2) actionview - kaminari-core (= 1.2.1) - kaminari-activerecord (1.2.1) + kaminari-core (= 1.2.2) + kaminari-activerecord (1.2.2) activerecord - kaminari-core (= 1.2.1) - kaminari-core (1.2.1) + kaminari-core (= 1.2.2) + kaminari-core (1.2.2) kas-grpc (0.0.2) grpc (~> 1.0) knapsack (1.21.1) @@ -794,7 +835,7 @@ GEM rest-client (~> 2.0) launchy (2.5.0) addressable (~> 2.7) - lefthook (1.1.1) + lefthook (1.2.0) letter_opener (1.7.0) launchy (~> 2.2) letter_opener_web (2.0.0) @@ -826,30 +867,32 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.18.0) + loofah (2.19.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) - lookbook (1.0.3) + lookbook (1.2.1) actioncable + activemodel css_parser htmlbeautifier (~> 1.3) htmlentities (~> 4.3.4) listen (~> 3.0) railties (>= 5.0) redcarpet (~> 3.5) - rouge (~> 3.26) + rouge (>= 3.26, < 5.0) view_component (~> 2.0) yard (~> 0.9.25) + zeitwerk (~> 2.5) lru_redux (1.1.0) lumberjack (1.2.7) mail (2.7.1) mini_mime (>= 0.1.1) marcel (1.0.2) - marginalia (1.10.0) - actionpack (>= 2.3) - activerecord (>= 2.3) + marginalia (1.11.1) + actionpack (>= 5.2) + activerecord (>= 5.2) memoist (0.16.2) - memory_profiler (0.9.14) + memory_profiler (1.0.1) method_source (1.0.0) mime-types (3.4.1) mime-types-data (~> 3.2015) @@ -895,7 +938,7 @@ GEM netrc (0.11.0) nio4r (2.5.8) no_proxy_fix (0.1.2) - nokogiri (1.13.8) + nokogiri (1.13.9) mini_portile2 (~> 2.8.0) racc (~> 1.4) notiffany (0.1.3) @@ -903,13 +946,13 @@ GEM shellany (~> 0.0) numerizer (0.2.0) oauth (0.5.6) - oauth2 (2.0.3) + oauth2 (2.0.9) faraday (>= 0.17.3, < 3.0) jwt (>= 1.0, < 3.0) multi_xml (~> 0.5) - rack (>= 1.2, < 3) - rash_alt (>= 0.4, < 1) - version_gem (~> 1.0) + rack (>= 1.2, < 4) + snaky_hash (~> 2.0) + version_gem (~> 1.1) octokit (4.25.1) faraday (>= 1, < 3) sawyer (~> 0.9) @@ -926,13 +969,15 @@ GEM plist (~> 3.1) train-core wmi-lite (~> 1.0) - oj (3.13.21) + oj (3.13.23) + oj-introspect (0.7.1) + oj (>= 3.13.23) omniauth (2.1.0) hashie (>= 3.4.6) rack (>= 2.2.3) rack-protection - omniauth-alicloud (1.0.1) - omniauth-oauth2 (~> 1.7.1) + omniauth-alicloud (2.0.0) + omniauth-oauth2 (~> 1.8) omniauth-atlassian-oauth2 (0.2.0) omniauth (>= 1.1.1) omniauth-oauth2 (>= 1.5) @@ -941,26 +986,29 @@ GEM omniauth-authentiq (0.3.3) jwt (>= 1.5) omniauth-oauth2 (>= 1.5) - omniauth-azure-activedirectory-v2 (1.0.0) - omniauth-oauth2 (~> 1.7) + omniauth-azure-activedirectory-v2 (2.0.0) + omniauth-oauth2 (~> 1.8) omniauth-dingtalk-oauth2 (1.0.1) omniauth-oauth2 (~> 1.7) omniauth-facebook (4.0.0) omniauth-oauth2 (~> 1.2) - omniauth-github (2.0.0) + omniauth-github (2.0.1) + omniauth (~> 2.0) + omniauth-oauth2 (~> 1.8) + omniauth-google-oauth2 (1.1.1) + jwt (>= 2.0) + oauth2 (~> 2.0.6) omniauth (~> 2.0) - omniauth-oauth2 (~> 1.7.1) + omniauth-oauth2 (~> 1.8.0) omniauth-oauth (1.2.0) oauth omniauth (>= 1.0, < 3) - omniauth-oauth2 (1.7.3) + omniauth-oauth2 (1.8.0) oauth2 (>= 1.4, < 3) - omniauth (>= 1.9, < 3) - omniauth-oauth2-generic (0.2.2) - omniauth-oauth2 (~> 1.0) - omniauth-rails_csrf_protection (1.0.1) - actionpack (>= 4.2) omniauth (~> 2.0) + omniauth-oauth2-generic (0.2.8) + omniauth-oauth2 (~> 1.0) + rake omniauth-saml (2.0.0) omniauth (~> 2.0) ruby-saml (~> 1.9) @@ -980,7 +1028,8 @@ GEM validate_email validate_url webfinger (>= 1.0.1) - openssl (2.2.0) + openssl (2.2.1) + ipaddr openssl-signature_algorithm (0.4.0) opentracing (0.5.0) optimist (3.0.1) @@ -988,29 +1037,29 @@ GEM rubypants (~> 0.2) orm_adapter (0.5.0) os (1.1.1) - pact (1.59.0) + pact (1.63.0) pact-mock_service (~> 3.0, >= 3.3.1) - pact-support (~> 1.15) - rack-test (>= 0.6.3, < 2.0.0) + pact-support (~> 1.16, >= 1.16.9) + rack-test (>= 0.6.3, < 3.0.0) rspec (~> 3.0) term-ansicolor (~> 1.0) thor (>= 0.20, < 2.0) webrick (~> 1.3) - pact-mock_service (3.6.2) + pact-mock_service (3.10.0) filelock (~> 1.1) find_a_port (~> 1.0.1) json - pact-support (~> 1.12, >= 1.12.0) + pact-support (~> 1.16, >= 1.16.4) rack (~> 2.0) rspec (>= 2.14) term-ansicolor (~> 1.0) thor (>= 0.19, < 2.0) webrick (~> 1.3) - pact-support (1.15.1) - awesome_print (~> 1.1) - randexp (~> 0.1.7) - rspec (>= 2.14) - term-ansicolor (~> 1.0) + pact-support (1.18.1) + awesome_print (~> 1.9) + diff-lcs (~> 1.4) + expgen (~> 0.1) + rainbow (~> 3.1.1) parallel (1.22.1) parser (3.1.2.1) ast (~> 2.4.1) @@ -1020,7 +1069,7 @@ GEM peek (1.1.0) railties (>= 4.0.0) pg (1.4.3) - pg_query (2.1.4) + pg_query (2.2.0) google-protobuf (>= 3.19.2) plist (3.6.0) png_quantizator (0.2.1) @@ -1050,7 +1099,7 @@ GEM pry (~> 0.13.0) tty-markdown tty-prompt - public_suffix (4.0.7) + public_suffix (5.0.0) puma (5.6.5) nio4r (~> 2.0) puma_worker_killer (0.3.1) @@ -1066,7 +1115,7 @@ GEM rack (>= 1.0, < 3) rack-cors (1.1.1) rack (>= 2.0.0) - rack-oauth2 (1.21.2) + rack-oauth2 (1.21.3) activesupport attr_required httpclient @@ -1074,11 +1123,11 @@ GEM rack (>= 2.1.0) rack-protection (2.2.2) rack - rack-proxy (0.7.2) + rack-proxy (0.7.4) rack - rack-test (1.1.0) - rack (>= 1.0, < 3) - rack-timeout (0.6.0) + rack-test (2.0.2) + rack (>= 1.3) + rack-timeout (0.6.3) rails (6.1.6.1) actioncable (= 6.1.6.1) actionmailbox (= 6.1.6.1) @@ -1114,9 +1163,6 @@ GEM thor (~> 1.0) rainbow (3.1.1) rake (13.0.6) - randexp (0.1.7) - rash_alt (0.4.12) - hashie (>= 3.4) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) @@ -1127,24 +1173,24 @@ GEM rbtree (0.4.4) rchardet (1.8.0) rdoc (6.3.2) - re2 (1.4.0) + re2 (1.6.0) recaptcha (4.13.1) json recursive-open-struct (1.1.3) redcarpet (3.5.1) - redis (4.7.1) + redis (4.8.0) redis-actionpack (5.3.0) actionpack (>= 5, < 8) redis-rack (>= 2.1.0, < 3) redis-store (>= 1.1.0, < 2) - redis-namespace (1.8.1) - redis (>= 3.0.4) + redis-namespace (1.9.0) + redis (>= 4) redis-rack (2.1.4) rack (>= 2.0.8, < 3) redis-store (>= 1.2, < 2) redis-store (1.9.1) redis (>= 4, < 5) - regexp_parser (2.5.0) + regexp_parser (2.6.0) regexp_property_values (1.0.0) representable (3.0.4) declarative (< 0.1.0) @@ -1180,7 +1226,7 @@ GEM benchmark-perf (~> 0.6) benchmark-trend (~> 0.4) rspec (>= 3.0) - rspec-core (3.10.1) + rspec-core (3.10.2) rspec-support (~> 3.10.0) rspec-expectations (3.10.1) diff-lcs (>= 1.2.0, < 2.0) @@ -1204,44 +1250,44 @@ GEM rspec-support (~> 3.10) rspec-retry (0.6.1) rspec-core (> 3.3) - rspec-support (3.10.2) - rspec_junit_formatter (0.4.1) + rspec-support (3.10.3) + rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) rspec_profiling (0.0.6) activerecord pg rails sqlite3 - rubocop (0.93.1) + rubocop (1.36.0) + json (~> 2.3) parallel (~> 1.10) - parser (>= 2.7.1.5) + parser (>= 3.1.2.1) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8) - rexml - rubocop-ast (>= 0.6.0) + regexp_parser (>= 1.8, < 3.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.20.1, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 2.0) + unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.21.0) parser (>= 3.1.1.0) rubocop-gitlab-security (0.1.1) rubocop (>= 0.51) rubocop-graphql (0.14.6) rubocop (>= 0.87, < 2) - rubocop-performance (1.9.2) - rubocop (>= 0.90.0, < 2.0) + rubocop-performance (1.14.3) + rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.9.1) + rubocop-rails (2.15.2) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 0.90.0, < 2.0) - rubocop-rspec (1.44.1) - rubocop (~> 0.87) - rubocop-ast (>= 0.7.1) - ruby-fogbugz (0.2.1) + rubocop (>= 1.7.0, < 2.0) + rubocop-rspec (2.12.1) + rubocop (~> 1.31) + ruby-fogbugz (0.3.0) crack (~> 0.4) + multipart-post (~> 2.0) ruby-magic (0.5.4) mini_portile2 (~> 2.6) - ruby-prof (1.3.1) ruby-progressbar (1.11.0) ruby-saml (1.13.0) nokogiri (>= 1.10.5) @@ -1303,11 +1349,11 @@ GEM shellany (0.0.1) shoulda-matchers (5.1.0) activesupport (>= 5.2.0) - sidekiq (6.4.2) - connection_pool (>= 2.2.2) + sidekiq (6.5.7) + connection_pool (>= 2.2.5) rack (~> 2.0) - redis (>= 4.2.0) - sidekiq-cron (1.4.0) + redis (>= 4.5.0, < 5) + sidekiq-cron (1.8.0) fugit (~> 1) sidekiq (>= 4.2.1) sigdump (0.2.4) @@ -1328,9 +1374,12 @@ GEM simplecov_json_formatter (0.1.4) sixarm_ruby_unaccent (1.2.0) slack-messenger (2.3.4) + snaky_hash (2.0.0) + hashie + version_gem (~> 1.1) snowplow-tracker (0.6.1) contracts (~> 0.7, <= 0.11) - solargraph (0.46.0) + solargraph (0.47.2) backport (~> 1.2) benchmark bundler (>= 1.17.2) @@ -1386,6 +1435,10 @@ GEM ffi (~> 1.1) sysexits (1.2.0) tanuki_emoji (0.6.0) + telesign (2.2.4) + net-http-persistent (>= 3.0.0, < 5.0) + telesignenterprise (2.2.2) + telesign (~> 2.2.3) temple (0.8.2) term-ansicolor (1.7.1) tins (~> 1.0) @@ -1399,13 +1452,13 @@ GEM text (1.3.1) thor (1.2.1) thrift (0.16.0) - tilt (2.0.10) + tilt (2.0.11) timecop (0.9.1) timeliness (0.3.10) timfel-krb5-auth (0.8.3) - tins (1.31.0) + tins (1.31.1) sync - toml-rb (2.0.1) + toml-rb (2.2.0) citrus (~> 3.0, > 3.0) tomlrb (1.3.0) tpm-key_attestation (0.9.0) @@ -1472,9 +1525,9 @@ GEM validates_hostname (1.0.11) activerecord (>= 3.0) activesupport (>= 3.0) - version_gem (1.0.0) + version_gem (1.1.0) version_sorter (2.2.4) - view_component (2.71.0) + view_component (2.74.1) activesupport (>= 5.0.0, < 8.0) concurrent-ruby (~> 1.0) method_source (~> 1.0) @@ -1522,6 +1575,7 @@ PLATFORMS ruby DEPENDENCIES + CFPropertyList RedCloth (~> 4.3.2) acme-client (~> 2.0) activerecord-explain-analyze (~> 0.1) @@ -1529,18 +1583,19 @@ DEPENDENCIES addressable (~> 2.8) akismet (~> 3.0) apollo_upload_server (~> 2.1.0) + arr-pm (~> 0.0.12) asana (~> 0.10.13) asciidoctor (~> 2.0.17) asciidoctor-include-ext (~> 0.4.0) - asciidoctor-kroki (~> 0.5.0) + asciidoctor-kroki (~> 0.7.0) asciidoctor-plantuml (~> 0.0.16) atlassian-jwt (~> 0.2.0) - attr_encrypted (~> 3.1.0) + attr_encrypted (~> 3.2.4)! autoprefixer-rails (= 10.2.5.1) awesome_print aws-sdk-cloudformation (~> 1) - aws-sdk-core (~> 3.131.0) - aws-sdk-s3 (~> 1.114.0) + aws-sdk-core (~> 3.167.0) + aws-sdk-s3 (~> 1.117.1) babosa (~> 1.0.4) base32 (~> 0.3.0) batch-loader (~> 2.0.1) @@ -1550,7 +1605,7 @@ DEPENDENCIES better_errors (~> 2.9.1) bootsnap (~> 1.13.0) bootstrap_form (~> 4.2.0) - browser (~> 4.2) + browser (~> 5.3.1) bullet (~> 7.0.2) bundler-audit (~> 0.7.0.1) bundler-checksum (~> 0.1.0)! @@ -1558,14 +1613,15 @@ DEPENDENCIES capybara-screenshot (~> 1.0.22) carrierwave (~> 1.3) charlock_holmes (~> 0.7.7) - commonmarker (~> 0.23.4) + commonmarker (~> 0.23.6) concurrent-ruby (~> 1.1) connection_pool (~> 2.0) countries (~> 3.0) creole (~> 0.5.0) crystalball (~> 0.7.0) + cvss-suite (~> 3.0.1) database_cleaner (~> 1.7.0) - deckar01-task_list (= 2.3.1) + deckar01-task_list (= 2.3.2) declarative_policy (~> 1.1.0) default_value_for (~> 3.4.0) deprecation_toolkit (~> 1.5.1) @@ -1586,8 +1642,6 @@ DEPENDENCIES email_reply_trimmer (~> 0.1) email_spec (~> 2.2.0) error_tracking_open_api! - erubi (~> 1.9.0) - escape_utils (~> 1.1) factory_bot_rails (~> 6.2.0) faraday (~> 1.0) faraday_middleware-aws-sigv4 (~> 0.3.0) @@ -1598,10 +1652,10 @@ DEPENDENCIES flipper-active_support_cache_store (~> 0.25.0) flowdock (~> 0.7) fog-aliyun (~> 0.3) - fog-aws (~> 3.14) + fog-aws (~> 3.15) fog-core (= 2.1.0) - fog-google (~> 1.15) - fog-local (~> 0.6) + fog-google (~> 1.19) + fog-local (~> 0.8) fog-openstack (~> 1.0) fog-rackspace (~> 0.1.1) fugit (~> 1.2.1) @@ -1609,29 +1663,30 @@ DEPENDENCIES gettext (~> 3.3) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 15.4.0.pre.rc2) - github-markup (~> 1.7.0) + gitaly (~> 15.5.0) gitlab-chronic (~> 0.10.5) - gitlab-dangerfiles (~> 3.5.2) + gitlab-dangerfiles (~> 3.6.2) gitlab-experiment (~> 0.7.1) - gitlab-fog-azure-rm (~> 1.3.0) - gitlab-labkit (~> 0.24.0) + gitlab-fog-azure-rm (~> 1.4.0) + gitlab-labkit (~> 0.28.0) gitlab-license (~> 2.2.1) gitlab-mail_room (~> 0.0.9) gitlab-markup (~> 1.8.0) gitlab-net-dns (~> 0.9.1) gitlab-omniauth-openid-connect (~> 0.10.0) - gitlab-sidekiq-fetcher (= 0.8.0) - gitlab-styles (~> 8.0.0) + gitlab-sidekiq-fetcher (= 0.9.0) + gitlab-styles (~> 9.0.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) + google-protobuf (~> 3.21, >= 3.21.9) gpgme (~> 2.0.19) grape (~> 1.5.2) grape-entity (~> 0.10.0) grape-path-helpers (~> 1.7.1) + grape-swagger (~> 1.5.0) + grape-swagger-entity (~> 0.5.1) grape_logging (~> 1.8) graphiql-rails (~> 1.8) graphlient (~> 0.5.0) @@ -1644,77 +1699,78 @@ DEPENDENCIES haml_lint (~> 0.40.0) hamlit (~> 2.15.0) hangouts-chat (~> 0.0.5) - hashie - hashie-forbidden_attributes + hashie (~> 5.0.0) health_check (~> 3.0) - html-pipeline (~> 2.13.2) + html-pipeline (~> 2.14.3) html2text - httparty (~> 0.16.4) + httparty (~> 0.20.0) icalendar - invisible_captcha (~> 1.1.0) + invisible_captcha (~> 2.0.0) + ipaddr (= 1.2.2) ipaddress (~> 0.8.3) ipynbdiff! jira-ruby (~> 2.1.4) - js_regex (~> 3.7) + js_regex (~> 3.8) json (~> 2.5.1) json_schemer (~> 0.2.18) jwt (~> 2.1.0) - kaminari (~> 1.0) + kaminari (~> 1.2.2) kas-grpc (~> 0.0.2) knapsack (~> 1.21.1) kramdown (~> 2.3.1) kubeclient (~> 4.9.3) - lefthook (~> 1.1.1) + lefthook (~> 1.2.0) letter_opener_web (~> 2.0.0) license_finder (~> 7.0) licensee (~> 9.15) lockbox (~> 0.6.2) lograge (~> 0.5) - loofah (~> 2.18.0) - lookbook (~> 1.0) + loofah (~> 2.19.0) + lookbook (~> 1.2, >= 1.2.1) lru_redux mail (= 2.7.1) mail-smtp_pool (~> 0.1.0)! - marginalia (~> 1.10.0) - memory_profiler (~> 0.9) + marginalia (~> 1.11.1) + memory_profiler (~> 1.0) microsoft_graph_mailer (~> 0.1.0)! mini_magick (~> 4.10.1) minitest (~> 5.11.0) multi_json (~> 1.14.1) net-ldap (~> 0.16.3) net-ntp - nokogiri (~> 1.13.8) + nokogiri (~> 1.13.9) oauth2 (~> 2.0) octokit (~> 4.15) ohai (~> 16.10) oj (~> 3.13.21) + oj-introspect (~> 0.7) omniauth (~> 2.1.0) - omniauth-alicloud (~> 1.0.1) + omniauth-alicloud (~> 2.0.0) omniauth-atlassian-oauth2 (~> 0.2.0) omniauth-auth0 (~> 2.0.0) omniauth-authentiq (~> 0.3.3) - omniauth-azure-activedirectory-v2 (~> 1.0) + omniauth-azure-activedirectory-v2 (~> 2.0) omniauth-azure-oauth2 (~> 0.0.9)! omniauth-cas3 (~> 1.1.4)! omniauth-dingtalk-oauth2 (~> 1.0) omniauth-facebook (~> 4.0.0) - omniauth-github (= 2.0.0) + omniauth-github (= 2.0.1) omniauth-gitlab (~> 4.0.0)! - omniauth-google-oauth2 (~> 1.0.1)! + omniauth-google-oauth2 (~> 1.1) omniauth-oauth2-generic (~> 0.2.2) - omniauth-rails_csrf_protection omniauth-salesforce (~> 1.0.5)! omniauth-saml (~> 2.0.0) omniauth-shibboleth (~> 1.3.0) omniauth-twitter (~> 1.4) omniauth_crowd (~> 2.4.0)! + openssl (= 2.2.1) org-ruby (~> 0.9.12) - pact (~> 1.12) + pact (~> 1.63) parallel (~> 1.19) parslet (~> 1.8) peek (~> 1.1) - pg (~> 1.4.0) - pg_query (~> 2.1.0) + pg (~> 1.4.3) + pg_query (~> 2.2) png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) prometheus-client-mmap (~> 0.16) @@ -1724,23 +1780,23 @@ DEPENDENCIES puma (~> 5.6.5) puma_worker_killer (~> 0.3.1) rack (~> 2.2.4) - rack-attack (~> 6.6.0) - rack-cors (~> 1.1.0) - rack-oauth2 (~> 1.21.2) - rack-proxy (~> 0.7.2) - rack-timeout (~> 0.6.0) + rack-attack (~> 6.6.1) + rack-cors (~> 1.1.1) + rack-oauth2 (~> 1.21.3) + rack-proxy (~> 0.7.4) + rack-timeout (~> 0.6.3) rails (~> 6.1.6.1) rails-controller-testing rails-i18n (~> 7.0) rainbow (~> 3.0) rbtrace (~> 0.4) rdoc (~> 6.3.2) - re2 (~> 1.4.0) + re2 (~> 1.6.0) recaptcha (~> 4.11) - redis (~> 4.7.0) + redis (~> 4.8.0) redis-actionpack (~> 5.3.0) - redis-namespace (~> 1.8.1) - request_store (~> 1.5) + redis-namespace (~> 1.9.0) + request_store (~> 1.5.1) responders (~> 3.0) retriable (~> 3.1.2) rexml (~> 3.2.5) @@ -1753,9 +1809,8 @@ DEPENDENCIES rspec_junit_formatter rspec_profiling (~> 0.0.6) rubocop - ruby-fogbugz (~> 0.2.1) + ruby-fogbugz (~> 0.3.0) ruby-magic (~> 0.5) - ruby-prof (~> 1.3.0) ruby-progressbar (~> 1.10) ruby-saml (~> 1.13.0) ruby_parser (~> 3.15) @@ -1772,8 +1827,8 @@ DEPENDENCIES sentry-sidekiq (~> 5.1.1) settingslogic (~> 2.0.9) shoulda-matchers (~> 5.1.0) - sidekiq (~> 6.4.0) - sidekiq-cron (~> 1.4.0) + sidekiq (~> 6.5.7) + sidekiq-cron (~> 1.8.0) sigdump (~> 0.2.4) simple_po_parser (~> 1.1.6) simplecov (~> 0.21) @@ -1781,7 +1836,7 @@ DEPENDENCIES simplecov-lcov (~> 0.8.0) slack-messenger (~> 2.3.4) snowplow-tracker (~> 0.6.1) - solargraph (~> 0.46.0) + solargraph (~> 0.47.2) spamcheck (~> 1.0.0) spring (~> 2.1.0) spring-commands-rspec (~> 1.0.4) @@ -1792,13 +1847,14 @@ DEPENDENCIES state_machines-activerecord (~> 0.8.0) sys-filesystem (~> 1.4.3) tanuki_emoji (~> 0.6) + telesignenterprise (~> 2.2) terser (= 1.0.2) 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.0) + toml-rb (~> 2.2.0) truncato (~> 0.7.12) typhoeus (~> 1.4.0) u2f (~> 0.2.1) @@ -1808,7 +1864,7 @@ DEPENDENCIES valid_email (~> 0.1) validates_hostname (~> 1.0.11) version_sorter (~> 2.2.4) - view_component (~> 2.71.0) + view_component (~> 2.74.1) vmstat (~> 2.3.0) warning (~> 1.3.0) webauthn (~> 2.3) @@ -1818,4 +1874,4 @@ DEPENDENCIES yajl-ruby (~> 1.4.3) BUNDLED WITH - 2.3.15 + 2.3.25 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 6e34481ef6d..edeb6eeb4d1 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -159,10 +159,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; + sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw"; type = "gem"; }; - version = "2.8.0"; + version = "2.8.1"; }; aes_key_wrap = { groups = ["default"]; @@ -205,6 +205,16 @@ }; version = "2.1.0"; }; + arr-pm = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fddw0vwdrr7v3a0lfqbmnd664j48a9psrjd3wh3k4i3flplizzx"; + type = "gem"; + }; + version = "0.0.12"; + }; asana = { dependencies = ["faraday" "faraday_middleware" "faraday_middleware-multi_json" "oauth2"]; groups = ["default"]; @@ -243,10 +253,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04jzsicaynwyy4l3w69x1qqww4av57army5xiapvv2b6g5s8nb32"; + sha256 = "08diy3wpmmaw9kabpr2wm908bgv71jj9l7z9fs6fj45fkkjf92jj"; type = "gem"; }; - version = "0.5.0"; + version = "0.7.0"; }; asciidoctor-plantuml = { dependencies = ["asciidoctor"]; @@ -280,17 +290,6 @@ }; version = "0.2.0"; }; - attr_encrypted = { - dependencies = ["encryptor"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ncv2az1zlj33bsllr6q1qdvbw42gv91lxq0ryclbv8l8xh841jg"; - type = "gem"; - }; - version = "3.1.0"; - }; attr_required = { groups = ["default"]; platforms = []; @@ -347,10 +346,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cx73zazv4jsh51b08jgf7pzn62wmfqlwwg2z8w4rcqbvn326n93"; + sha256 = "1z5k0zi8lnlwmxp27aqic6l9rmc15g6y62awpb3nhkkwr0gy58mv"; type = "gem"; }; - version = "1.600.0"; + version = "1.658.0"; }; aws-sdk-cloudformation = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -369,10 +368,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yiz3aaik62rxhxipwznb2bv8ywha13vdxg9nk6anq9bd0nn0728"; + sha256 = "095nj7sf8914y60m1grnpy7cm6ybnw4ywnc0j84gz2vgv1m8awfk"; type = "gem"; }; - version = "3.131.1"; + version = "3.167.0"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -380,10 +379,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m8vwm4cakfv3i4f723a6id07myx18fpdbq8ypa2j7r5njwxpmzz"; + sha256 = "0lq1f03gy02f8z5fpc61kngkja8kkgk2m8cc6g42aij0iszjw03c"; type = "gem"; }; - version = "1.57.0"; + version = "1.59.0"; }; aws-sdk-s3 = { dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; @@ -391,10 +390,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r6dxz3llgxbbm66jq5mkzk0i6qsxwv0d9s0ipwb23vv3bgp23yf"; + sha256 = "17ah9j82313ynb8nkcbq21fa3dy1a3v6lk5kdrhphazbpb2xmxkn"; type = "gem"; }; - version = "1.114.0"; + version = "1.117.1"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -402,10 +401,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xp7diwq7nv4vvxrl9x3lis2l4x6bissrfzbfyy6rv5bmj5w109z"; + sha256 = "1d4bifmll4hrf4gihr5hdvn59wjpz4qpyg5jj95kp17fykzqg36n"; type = "gem"; }; - version = "1.5.0"; + version = "1.5.1"; }; azure-storage-blob = { dependencies = ["azure-storage-common" "nokogiri"]; @@ -511,14 +510,14 @@ }; benchmark-memory = { dependencies = ["memory_profiler"]; - groups = ["default"]; + groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11qw8k6rl79ri00njrf1x9v6vzwgv12rkcvgzvg0sk8pfrkzwyxa"; + sha256 = "0p5bwqc828yai7h71b7ny77hgd7dll00dy34izp3b5dh6dj467na"; type = "gem"; }; - version = "0.1.2"; + version = "0.2.0"; }; benchmark-perf = { groups = ["default" "test"]; @@ -556,10 +555,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06lqi4svq5qls9f7nnvd2zmjdqmi2sf82sq78ci5d78fq0z5x2vr"; + sha256 = "0shg48ilaxn8ps8arvyb8pr6pqigdmccirks185c306dzychr3n3"; type = "gem"; }; - version = "2.4.10"; + version = "2.4.11"; }; binding_ninja = { groups = ["default" "development" "test"]; @@ -598,10 +597,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q1yzvbqp0mykswipq3w00ljw9fgkhjfrij3hkwi7cx85r14n6gw"; + sha256 = "0g4bcpax07kqqr9cp7cjc7i0pcij4nqpn1rdsg2wdwhzf00m6x32"; type = "gem"; }; - version = "4.2.0"; + version = "5.3.1"; }; builder = { groups = ["default" "development" "test"]; @@ -692,6 +691,17 @@ }; version = "0.5.9.6"; }; + CFPropertyList = { + dependencies = ["rexml"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "193l8r1ycd3dcxa7lsb4pqcghbk56dzc5244m6y8xmv88z6m31d7"; + type = "gem"; + }; + version = "3.0.5"; + }; character_set = { dependencies = ["sorted_set"]; groups = ["default"]; @@ -814,10 +824,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kn7x7smqsk0x2iq17dbbaay0qimmgza8wbdlrs66dvn0l2wpncm"; + sha256 = "0f3v6ffikj694h925zvfzgx995q6l1ixnqpph3qpnjdsyjpsmbn8"; type = "gem"; }; - version = "0.23.4"; + version = "0.23.6"; }; concurrent-ruby = { groups = ["default" "development" "test"]; @@ -834,10 +844,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ffdxhgirgc86qb42yvmfj6v1v0x4lvi0pxn9zhghkff44wzra0k"; + sha256 = "1nj4r58m5cpfdsijj6gjfs3yzcnxq2halagjk07wjcrgj6z8ayb7"; type = "gem"; }; - version = "2.2.5"; + version = "2.3.0"; }; contracts = { groups = ["default"]; @@ -926,14 +936,24 @@ }; css_parser = { dependencies = ["addressable"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1107j3frhmcd95wcsz0rypchynnzhnjiyyxxcl6dlmr2lfy08z4b"; + type = "gem"; + }; + version = "1.12.0"; + }; + cvss-suite = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qbdgp36dhcyljhmfxrvbgp1ha9yqxhxgyg3sdm48y9m371jd2an"; + sha256 = "1yfkibv7c7aazh8p3v9mksa2rdkqacq1x3621pyl4ah3jjg9xjmm"; type = "gem"; }; - version = "1.11.0"; + version = "3.0.1"; }; danger = { dependencies = ["claide" "claide-plugins" "colored2" "cork" "faraday" "faraday-http-cache" "git" "kramdown" "kramdown-parser-gfm" "no_proxy_fix" "octokit" "terminal-table"]; @@ -983,10 +1003,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18bwkvxjr7khxj95xrg1vj7va522vbm2li9wsiiw01cg5b10hni0"; + sha256 = "01c8vv0xwbhlyhiagj93b1hlm2n0rmj4sw62nbc0jhyj90jhj6as"; type = "gem"; }; - version = "2.3.1"; + version = "2.3.2"; }; declarative = { groups = ["default"]; @@ -1046,10 +1066,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cxaqvfhm8xpv3hvpwn7y4g5315zzf5gsdffdkm1bisjviwvmc15"; + sha256 = "0kx1i7qsb5gvc24kxwq4bpcvsknm4c04mq7mz27m7dgfdhhcdbga"; type = "gem"; }; - version = "2.1.1"; + version = "2.1.2"; }; device_detector = { groups = ["default"]; @@ -1073,7 +1093,7 @@ version = "4.8.1"; }; devise-two-factor = { - dependencies = ["activesupport" "attr_encrypted" "devise" "railties" "rotp"]; + dependencies = ["activesupport" "devise" "railties" "rotp"]; groups = ["default"]; platforms = []; source = { @@ -1373,10 +1393,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x"; + sha256 = "11bz1v1cxabm8672gabrw542zyg51dizlcvdck6vvwzagxbjv9zx"; type = "gem"; }; - version = "1.9.0"; + version = "1.11.0"; }; escape_utils = { groups = ["default" "development" "test"]; @@ -1430,6 +1450,17 @@ }; version = "2.8.1"; }; + expgen = { + dependencies = ["parslet"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fd2sdh3lc3x0qds30czli8k5qr45bkb7ssx0kb038hhn9jhysjf"; + type = "gem"; + }; + version = "0.1.1"; + }; expression_parser = { groups = ["default"]; platforms = []; @@ -1531,10 +1562,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "143cpzdrnyqyfv1jasr0qjqgm57dhv46nsf5f2s06ndxccfr13rq"; + sha256 = "1qsycf92z2797m9v6calp4yhz565vdsfazi7rj0rxy3jxvlv4lgv"; type = "gem"; }; - version = "2.4.0"; + version = "2.4.1"; }; faraday-httpclient = { groups = ["danger" "default" "development" "test"]; @@ -1782,10 +1813,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gsb26a1jp0k7hclry0dai2a9m77a9h6ybc17x0i98z2ivzjsi07"; + sha256 = "130y73isnky4kgqwr1jhci3b51ld4i9r5a7132q6aq8cx8qjjx89"; type = "gem"; }; - version = "3.14.0"; + version = "3.15.0"; }; fog-core = { dependencies = ["builder" "excon" "formatador" "mime-types"]; @@ -1799,15 +1830,15 @@ version = "2.1.0"; }; fog-google = { - dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client" "google-cloud-env"]; + dependencies = ["fog-core" "fog-json" "fog-xml" "google-apis-compute_v1" "google-apis-dns_v1" "google-apis-iamcredentials_v1" "google-apis-monitoring_v3" "google-apis-pubsub_v1" "google-apis-sqladmin_v1beta4" "google-apis-storage_v1" "google-cloud-env"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01mky1gqgg8vijr2avyspc9l4asjzkr5xc31x4c4ff7jzf00g11g"; + sha256 = "127l22c7lhg166sylfhxys41p0i3nlkxkpzzgw8q9zip10irm41w"; type = "gem"; }; - version = "1.15.0"; + version = "1.19.0"; }; fog-json = { dependencies = ["fog-core" "multi_json"]; @@ -1826,10 +1857,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ba4lln35nryi6dcbz68vxg9ml6v8cc8s8c82f7syfd84bz76x21"; + sha256 = "0yggsxd7c58p5i8zgvfw9rkqlg75l6hkbwnpgawd2sacwl4jsfr6"; type = "gem"; }; - version = "0.6.0"; + version = "0.8.0"; }; fog-openstack = { dependencies = ["fog-core" "fog-json" "ipaddress"]; @@ -1916,6 +1947,16 @@ }; version = "3.0.1"; }; + gems = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1w26k4db8yj6x1gpxvh1rma4p36hz61xkk7kjf0z61nrajyp8g9l"; + type = "gem"; + }; + version = "1.2.0"; + }; get_process_mem = { dependencies = ["ffi"]; groups = ["default" "puma" "test"]; @@ -1977,20 +2018,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qzqyglw7akval4rxjyqygs2abdrziy6ry0cy135lq1hlwl4axj8"; + sha256 = "0hpgljz05rhik15z081ghxw9pw83vz78p12wjdgxj3qz1a4x8pfq"; type = "gem"; }; - version = "15.4.0.pre.rc2"; - }; - github-markup = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17g6g18gdjg63k75sfwiskjzl9i0hfcnrkcpb4fwrnb20v3jgswp"; - type = "gem"; - }; - version = "1.7.0"; + version = "15.5.0"; }; gitlab = { dependencies = ["httparty" "terminal-table"]; @@ -2020,10 +2051,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07zhs9mz9gi6hgarm0px55kn6wxfah1xkcdrk217yv1vp1aqmqps"; + sha256 = "1if6makvlxxmjsyaga660smrw4ij9a0b6xh7mmifih5mpcr5an48"; type = "gem"; }; - version = "3.5.2"; + version = "3.6.2"; }; gitlab-experiment = { dependencies = ["activesupport" "request_store"]; @@ -2042,10 +2073,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d8plrl69q5mcsgz8ywhw7k9q0g31y3gm6h90gw9apsisqbm7vrg"; + sha256 = "0zpbw2i1igv6ywqikip64w2xa5sqb9vg98qli0hab2h25g1n6hdg"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.0"; }; gitlab-labkit = { dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"]; @@ -2053,10 +2084,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j0598m9445msa0rksl1l1cvd11wsnyq1s4gjmcbw18a9smfa5lg"; + sha256 = "0m2n5lvnm5nxn7bc6bqm3ycwk47kck6nl1c0s83pcvsn6qizbsx7"; type = "gem"; }; - version = "0.24.0"; + version = "0.28.0"; }; gitlab-license = { groups = ["default"]; @@ -2110,15 +2141,15 @@ version = "0.10.0"; }; gitlab-sidekiq-fetcher = { - dependencies = ["sidekiq"]; + dependencies = ["json" "sidekiq"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qkkwd2sj9l6nmvipd1308ni01m2n8ixqwl6syl493cm5am4qmlw"; + sha256 = "15rqw4rx7fwall9ajbgkrv3skh70c0dlwfffvzkch84z0pn1l12l"; type = "gem"; }; - version = "0.8.0"; + version = "0.9.0"; }; gitlab-styles = { dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-graphql" "rubocop-performance" "rubocop-rails" "rubocop-rspec"]; @@ -2126,10 +2157,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nk6gdgjs920kfzyj35im2m3rp79vhmamg8f8f3y74vh7dadhxzz"; + sha256 = "1b9vvgdgzsaiq1kp3f38xm9bmigy8ky4v8lv63i5nyl0iymxy3pg"; type = "gem"; }; - version = "8.0.0"; + version = "9.0.0"; }; gitlab_chronic_duration = { dependencies = ["numerizer"]; @@ -2176,15 +2207,125 @@ version = "6.4.0"; }; google-api-client = { - dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "signet"]; + dependencies = ["google-apis-core" "google-apis-generator"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zypv7qz37ql5fqnlmk39krbazzshjzsw44syg7p0ap03zr6w021"; + type = "gem"; + }; + version = "0.53.0"; + }; + google-apis-compute_v1 = { + dependencies = ["google-apis-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jsz21m0mkjhn6yik2rshgg8i17sdwm8rmq0pfhfs6pwkv7kg5b2"; + type = "gem"; + }; + version = "0.53.0"; + }; + google-apis-core = { + dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "webrick"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05ynbapd26wppcqa81kw6kb8a39mzp0fql1rwmk3lgr95ybmxr1s"; + sha256 = "0d5h7sm8asxg252dnkk91sq51ynk1m06i15an6s04ihsi5ja64n0"; type = "gem"; }; - version = "0.50.0"; + version = "0.9.1"; + }; + google-apis-discovery_v1 = { + dependencies = ["google-apis-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05as93y4c613dg70xpyzs18a18vqm0bkl2slv3myb1382bzcqnif"; + type = "gem"; + }; + version = "0.12.0"; + }; + google-apis-dns_v1 = { + dependencies = ["google-apis-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0k7k1nanm4wqyx19m5x9xzzm3nvf89gg5vr1dq4nfyvkl8g668zm"; + type = "gem"; + }; + version = "0.28.0"; + }; + google-apis-generator = { + dependencies = ["activesupport" "gems" "google-apis-core" "google-apis-discovery_v1" "thor"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0y8j6bxgl1sxq2n3hslvld09xv6bcympk30if681xci1s6zgwmj6"; + type = "gem"; + }; + version = "0.11.0"; + }; + google-apis-iamcredentials_v1 = { + dependencies = ["google-apis-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06smnmn2s460xl9x9rh07a3fkqdrjjy6azmx8iywggqgv2k5d8p9"; + type = "gem"; + }; + version = "0.15.0"; + }; + google-apis-monitoring_v3 = { + dependencies = ["google-apis-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0skk42y2y81jlj0qfk790wqz3sdaxrykrc4mp1ysr0zsinp654id"; + type = "gem"; + }; + version = "0.37.0"; + }; + google-apis-pubsub_v1 = { + dependencies = ["google-apis-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gg1br0pj16iag3xax942g101zk4rk48isdpz5abyhc070amk45q"; + type = "gem"; + }; + version = "0.30.0"; + }; + google-apis-sqladmin_v1beta4 = { + dependencies = ["google-apis-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0r8npqk6hsvj31dcfn8y0449gds2v75jkk209r7vyj2mrk6pj0nh"; + type = "gem"; + }; + version = "0.38.0"; + }; + google-apis-storage_v1 = { + dependencies = ["google-apis-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0l6qhspmpgafj7wgwad6j7fxv1kxvim7sxvfyzb6d6chzh3ww6la"; + type = "gem"; + }; + version = "0.20.0"; }; google-cloud-env = { dependencies = ["faraday"]; @@ -2202,10 +2343,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ysvm5mxx1knjp3sbhi18nswaml625vbgm3gbh7is14h4d8fwjy9"; + sha256 = "1p4aa5nnkkrdd3v3i57092vj2agj7ih3zavymw451j52k8anqras"; type = "gem"; }; - version = "3.21.5"; + version = "3.21.9"; }; googleapis-common-protos-types = { dependencies = ["google-protobuf"]; @@ -2224,10 +2365,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cm60nbmwzf83fzy06f3iyn5a6sw91siw8x9bdvpwwmjsmivana6"; + sha256 = "1hpwgwhk0lmnknkw8kbdfxn95qqs6aagpq815l5fkw9w6mi77pai"; type = "gem"; }; - version = "0.14.0"; + version = "1.3.0"; }; gpgme = { dependencies = ["mini_portile2"]; @@ -2273,6 +2414,28 @@ }; version = "1.7.1"; }; + grape-swagger = { + dependencies = ["grape"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zy84lxrnnslray9rmfgb7ri295wda3cxx3xryz4lr5hd8r5p24w"; + type = "gem"; + }; + version = "1.5.0"; + }; + grape-swagger-entity = { + dependencies = ["grape-entity" "grape-swagger"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08smc3c2li1xa2nmgjkn742sp1xj9qzppy28v68cz5mc00nkf7pm"; + type = "gem"; + }; + version = "0.5.1"; + }; grape_logging = { dependencies = ["grape" "rack"]; groups = ["default"]; @@ -2466,25 +2629,14 @@ version = "1.0.1"; }; hashie = { - groups = ["default" "kerberos"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "02bsx12ihl78x0vdm37byp78jjw2ff6035y7rrmbd90qxjwxr43q"; - type = "gem"; - }; - version = "4.1.0"; - }; - hashie-forbidden_attributes = { - dependencies = ["hashie"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1chgg5d2iddja6ww02x34g8avg11fzmzcb8yvnqlykii79zx6vis"; + sha256 = "1nh3arcrbz1rc1cr59qm53sdhqm137b258y8rcb4cvd3y98lwv4x"; type = "gem"; }; - version = "0.1.1"; + version = "5.0.0"; }; health_check = { dependencies = ["railties"]; @@ -2492,10 +2644,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07wrbfsfsprfmykc0qbkkgxpf8vlx4a8sp77acqrjsh395f6qcqv"; + sha256 = "0mrv2323hx4lbcr6xii6ry89b3zvly5jsaacwbblxibx4c46a50h"; type = "gem"; }; - version = "3.0.0"; + version = "3.1.0"; }; heapy = { dependencies = ["thor"]; @@ -2514,10 +2666,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00xqmlny1b4ixff8sk0rkl4wcgwqc6v93qv8l3rn8d1dppvq7pm1"; + sha256 = "180kjksi0sdlqb0aq0bhal96ifwqm25hzb3w709ij55j51qls7ca"; type = "gem"; }; - version = "2.13.2"; + version = "2.14.3"; }; html2text = { dependencies = ["nokogiri"]; @@ -2605,14 +2757,14 @@ }; httparty = { dependencies = ["mime-types" "multi_xml"]; - groups = ["default"]; + groups = ["danger" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "109xvhl35dsk9zp65n5pdkhiijhqxdyvajbs74nkp4z8yl09vj32"; + sha256 = "0rs8c5wga6f1acyaj90d2hlv307gh2flfpb8y48wdk2si812l3a9"; type = "gem"; }; - version = "0.16.4"; + version = "0.20.0"; }; httpclient = { groups = ["default"]; @@ -2646,14 +2798,25 @@ version = "0.8.0"; }; icalendar = { + dependencies = ["ice_cube"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xsydpp2xph00awi25axv2mwjd5p2rlgd4qb3kh05lvq795kirxd"; + sha256 = "11zfs0l8y2a6gpf0krm91d0ap2mnf04qky89dyzxwaspqxqgj174"; type = "gem"; }; - version = "2.4.1"; + version = "2.8.0"; + }; + ice_cube = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1dri4mcya1fwzrr9nzic8hj1jr28a2szjag63f9k7p2bw9fpw4fs"; + type = "gem"; + }; + version = "0.16.4"; }; imagen = { dependencies = ["parser"]; @@ -2672,10 +2835,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lmlx3g4z894vwsgbpxhpmkn63n74mynklbwy07l7ccak552jw1n"; + sha256 = "0hn06njrwbxhxs2myr04fq3spqn38b8wm3irvkll91qv3p5yv0d3"; type = "gem"; }; - version = "1.1.0"; + version = "2.0.0"; + }; + ipaddr = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ycz5z25dykxy4sqdifgw6xszpgiy4hc0nv7sd89hm3x6vk6x497"; + type = "gem"; + }; + version = "1.2.2"; }; ipaddress = { groups = ["default"]; @@ -2735,10 +2908,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xarq1fqjaz6v139zzy4nwjg8c253fkvifn345gilva1qilaqgxi"; + sha256 = "1da4ccsq5bycg28iv0smmrra80jad3a8ya10lps5lv8fbbfvqd3r"; type = "gem"; }; - version = "3.7.0"; + version = "3.8.0"; }; json = { groups = ["default"]; @@ -2751,15 +2924,15 @@ version = "2.5.1"; }; json-jwt = { - dependencies = ["activesupport" "aes_key_wrap" "bindata"]; + dependencies = ["activesupport" "aes_key_wrap" "bindata" "httpclient"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nzbk1mrbf9mnvjpn3bxy8a85rjf94qmfdnvk78mjzk8pa0fvgdr"; + sha256 = "04315mf4p9qa97grdfqv922paghzdfrbb982ap0p99rqwla4znv6"; type = "gem"; }; - version = "1.13.0"; + version = "1.15.3"; }; json_schemer = { dependencies = ["ecma-re-validator" "hana" "regexp_parser" "uri_template"]; @@ -2799,10 +2972,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vxkqciny5v4jgmjxl8qrgbmig2cij2iskqbwh4bfcmpxf467ch3"; + sha256 = "0gia8irryvfhcr6bsr64kpisbgdbqjsqfgrk12a11incmpwny1y4"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; kaminari-actionview = { dependencies = ["actionview" "kaminari-core"]; @@ -2810,10 +2983,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w0p1hyv6lgf6h036cmn2kbkdv4x7g0g9q9kc5gzkpz7amlxr8ri"; + sha256 = "02f9ghl3a9b5q7l079d3yzmqjwkr4jigi7sldbps992rigygcc0k"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; kaminari-activerecord = { dependencies = ["activerecord" "kaminari-core"]; @@ -2821,20 +2994,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02n5xxv6ilh39q2m6vcz7qrdai7ghk3s178dw6f0b3lavwyq49w3"; + sha256 = "0c148z97s1cqivzbwrak149z7kl1rdmj7dxk6rpkasimmdxsdlqd"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; kaminari-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h04cr4y1jfn81gxy439vmczifghc2cvsyw47aa32is5bbxg1wlz"; + sha256 = "1zw3pg6kj39y7jxakbx7if59pl28lhk98fx71ks5lr3hfgn6zliv"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; kas-grpc = { dependencies = ["grpc"]; @@ -2907,10 +3080,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nyhh3h96c118xcyfmn2595fhavi9r0g2v7rckqzc56walncszgs"; + sha256 = "1avkih414xnaznjlwp64cw4jhzvb7yd4szmnb88yvi7aj4n8r7hq"; type = "gem"; }; - version = "1.1.1"; + version = "1.2.0"; }; letter_opener = { dependencies = ["launchy"]; @@ -3014,21 +3187,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18ymp6l3bv7abz07k6qbbi9c9vsiahq30d2smh4qzsvag8j5m5v1"; + sha256 = "1fpyk1965py77al7iadkn5dibwgvybknkr7r8bii2dj73wvr29rh"; type = "gem"; }; - version = "2.18.0"; + version = "2.19.0"; }; lookbook = { - dependencies = ["actioncable" "css_parser" "htmlbeautifier" "htmlentities" "listen" "railties" "redcarpet" "rouge" "view_component" "yard"]; + dependencies = ["actioncable" "activemodel" "css_parser" "htmlbeautifier" "htmlentities" "listen" "railties" "redcarpet" "rouge" "view_component" "yard" "zeitwerk"]; groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mmw3jklhhrvvmp2fswld7pipdgw3s5l3fg3dgv353jq6w516gn5"; + sha256 = "1mv5q4gpgzklwrgp7s7mhi0gb7x739qhyrni2n96i2vr4nv48a3l"; type = "gem"; }; - version = "1.0.3"; + version = "1.2.1"; }; lru_redux = { groups = ["default"]; @@ -3077,10 +3250,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1003hf828anbd3pxwzs9ir9sclh64mgj971n4a7ilgj9xs8r0a38"; + sha256 = "1kw9l9gw9dqmbpjxs3ndifia2204n8n92pjr4xp78hiynqm22qyb"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.1"; }; memoist = { groups = ["default"]; @@ -3093,14 +3266,14 @@ version = "0.16.2"; }; memory_profiler = { - groups = ["default"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04ivhv1bilwqm33jv28gar2vwzsichb5nipaq395d3axabv8qmfy"; + sha256 = "1c81d68r4wx0ckbmqxlfqc2qpd94jwcmqdm0xgr0s46r48pv9k9q"; type = "gem"; }; - version = "0.9.14"; + version = "1.0.1"; }; method_source = { groups = ["default" "development" "metrics" "test"]; @@ -3431,10 +3604,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g7axlq2y6gzmixzzzhw3fn6nhrhg469jj8gfr7gs8igiclpkhkr"; + sha256 = "0cam1455nmi3fzzpa9ixn2hsim10fbprmj62ajpd6d02mwdprwwn"; type = "gem"; }; - version = "1.13.8"; + version = "1.13.9"; }; notiffany = { dependencies = ["nenv" "shellany"]; @@ -3468,15 +3641,15 @@ version = "0.5.6"; }; oauth2 = { - dependencies = ["faraday" "jwt" "multi_xml" "rack" "rash_alt" "version_gem"]; + dependencies = ["faraday" "jwt" "multi_xml" "rack" "snaky_hash" "version_gem"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06y4wnsc1flbgv8vhh650x7f2k0k8238zcrmncil4swkb9kdhhxk"; + sha256 = "1yzpaghh8kwzgmvmrlbzf36ks5s2hf34rayzw081dp2jrzprs7xj"; type = "gem"; }; - version = "2.0.3"; + version = "2.0.9"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -3505,10 +3678,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ihfnl0maszdq821h6mivr8xickjab6ccyncnm5rn2vgrj6imwxf"; + sha256 = "0lggrhlihxyfgiqqr9b2fqdxc4d2zff2czq30m3rgn8a0b2gsv90"; type = "gem"; }; - version = "3.13.21"; + version = "3.13.23"; + }; + oj-introspect = { + dependencies = ["oj"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h2hw0cxs8z6g3bkrsrxmlixcmalnlmj9rzcd8sxaqjs95w4wn7a"; + type = "gem"; + }; + version = "0.7.1"; }; omniauth = { dependencies = ["hashie" "rack" "rack-protection"]; @@ -3527,10 +3711,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yk9vlqm7warm83l5vy44z7q4rg4mismqmb4bmgapllqiw5yr09g"; + sha256 = "1qsx4ri5rbr68djyqd5523rcyxhzi5v05f66wz0iflyda6fkdkwf"; type = "gem"; }; - version = "1.0.1"; + version = "2.0.0"; }; omniauth-atlassian-oauth2 = { dependencies = ["omniauth" "omniauth-oauth2"]; @@ -3571,10 +3755,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pv9pxff3g4cva76zzsx8fibb08c9av51lxksh73mbl9rrxdgkgd"; + sha256 = "0wnhibz903ssnq9scl65a47d41zcczb3wjvc44y3w8ydabfwx164"; type = "gem"; }; - version = "1.0.0"; + version = "2.0.0"; }; omniauth-dingtalk-oauth2 = { dependencies = ["omniauth-oauth2"]; @@ -3604,54 +3788,54 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jc66zp4bhwy7c6s817ws0nkimski3crrhwd7xyy55ss29v6b8hw"; + sha256 = "1m6a7kg3lxz2nm96prln2ja8r4wlm37m5vsy9199vnynqq5fgy4g"; type = "gem"; }; - version = "2.0.0"; + version = "2.0.1"; }; - omniauth-oauth = { - dependencies = ["oauth" "omniauth"]; + omniauth-google-oauth2 = { + dependencies = ["jwt" "oauth2" "omniauth" "omniauth-oauth2"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yw2vzx633p9wpdkd4jxsih6mw604mj7f6myyfikmj4d95c8d9z7"; + sha256 = "0fahkghfa2iczmwss9bz5l4rh7siwzjnjp3akh7pdbsfx0kg35j4"; type = "gem"; }; - version = "1.2.0"; + version = "1.1.1"; }; - omniauth-oauth2 = { - dependencies = ["oauth2" "omniauth"]; + omniauth-oauth = { + dependencies = ["oauth" "omniauth"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ia73zcbmhf02krlkq2rxmksx93jp777ax5x58fzkq3jzacqyniz"; + sha256 = "0yw2vzx633p9wpdkd4jxsih6mw604mj7f6myyfikmj4d95c8d9z7"; type = "gem"; }; - version = "1.7.3"; + version = "1.2.0"; }; - omniauth-oauth2-generic = { - dependencies = ["omniauth-oauth2"]; + omniauth-oauth2 = { + dependencies = ["oauth2" "omniauth"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m6vpip3rm1spx1x9y1kjczzailsph1xqgaakqylzq3jqkv18273"; + sha256 = "0y4y122xm8zgrxn5nnzwg6w39dnjss8pcq2ppbpx9qn7kiayky5j"; type = "gem"; }; - version = "0.2.2"; + version = "1.8.0"; }; - omniauth-rails_csrf_protection = { - dependencies = ["actionpack" "omniauth"]; + omniauth-oauth2-generic = { + dependencies = ["omniauth-oauth2" "rake"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kwswnkyl8ym6i4wv65qh3qchqbf2n0c6lbhfgbvkds3gpmnlm7w"; + sha256 = "04vnmszmm1jmwvg6cwdy9jxliwa8yawp4w4690pvyplx04wqavnf"; type = "gem"; }; - version = "1.0.1"; + version = "0.2.8"; }; omniauth-saml = { dependencies = ["omniauth" "ruby-saml"]; @@ -3708,14 +3892,15 @@ version = "1.3.0"; }; openssl = { + dependencies = ["ipaddr"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03wbynzkhay7l1x76srjkg91q48mxl575vrxb3blfxlpqwsvvp0w"; + sha256 = "0wkx3b598mxmr3idfbgas0cnrds54bfivnn1ip0d7z7kcr5vzbzn"; type = "gem"; }; - version = "2.2.0"; + version = "2.2.1"; }; openssl-signature_algorithm = { groups = ["default"]; @@ -3784,10 +3969,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ngwc4zrp6jxpb8s0y07xxic492a1n0akjxd7x4hks2fbsiwwwk2"; + sha256 = "0ldi3j95dh3c29w4bliykfdd08r95d4zvbdblk385w9b4knr2afc"; type = "gem"; }; - version = "1.59.0"; + version = "1.63.0"; }; pact-mock_service = { dependencies = ["filelock" "find_a_port" "json" "pact-support" "rack" "rspec" "term-ansicolor" "thor" "webrick"]; @@ -3795,21 +3980,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0izmf5h0n1mcrfk6qlz61rhzdjs6h0bkqrx6ndp8nhmfhja254fc"; + sha256 = "09syv4y0g0pvjshxj8i0yg7mrvszgp503is1b78k86bgv6wc73l9"; type = "gem"; }; - version = "3.6.2"; + version = "3.10.0"; }; pact-support = { - dependencies = ["awesome_print" "randexp" "rspec" "term-ansicolor"]; + dependencies = ["awesome_print" "diff-lcs" "expgen" "rainbow"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07qxvxy48im9vlswqspsh2k6fy6rsmi3409863ww8y7yx5pmjr63"; + sha256 = "0xh4idg0m1mr0pkywj5f79nlr4g6n4waism86gj34h8wicf9c9aa"; type = "gem"; }; - version = "1.15.1"; + version = "1.18.1"; }; parallel = { groups = ["development" "test"]; @@ -3880,10 +4065,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fyhhb5f2y5mqk5vg5ykicxp58wwhc7invfp27x8d7fgi0zkdwa8"; + sha256 = "0l79y41nwwacabj61jkbh4r7haajaf8y4bn5pihh0m1g8547b8w4"; type = "gem"; }; - version = "2.1.4"; + version = "2.2.0"; }; plist = { groups = ["default"]; @@ -4012,10 +4197,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb"; + sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6"; type = "gem"; }; - version = "4.0.7"; + version = "5.0.0"; }; puma = { dependencies = ["nio4r"]; @@ -4118,10 +4303,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wiz38c155g236sgrw0qnn33ysjmqhwq3hc1hqfw2fi4mmy1bz06"; + sha256 = "1fknwsxz4429w1hndl6y30cmm2n34wmmaaj2hhp6jrm8ssfsfwjf"; type = "gem"; }; - version = "1.21.2"; + version = "1.21.3"; }; rack-protection = { dependencies = ["rack"]; @@ -4140,10 +4325,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dpl6vi9yiv6k8gnr3zrsq7kd1dwbn8vkn70sw7dp975sgb4ziw9"; + sha256 = "1m6j2xk3s3ps3r9vqgwq3flyij9jgkyzanmgiifid8yqhcskgfx8"; type = "gem"; }; - version = "0.7.2"; + version = "0.7.4"; }; rack-test = { dependencies = ["rack"]; @@ -4151,20 +4336,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rh8h376mx71ci5yklnpqqn118z3bl67nnv5k801qaqn1zs62h8m"; + sha256 = "0rjl709krgf499dhjdapg580l2qaj9d91pwzk8ck8fpnazlx1bdd"; type = "gem"; }; - version = "1.1.0"; + version = "2.0.2"; }; rack-timeout = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16ahj3qz3xhfrwvqb4nf6cfzvliigg0idfsp5jyr8qwk676d2f30"; + sha256 = "1cqa9lh2rdqqvhfxbrdys7mj2x4vxhqmf57iww2x8961mhp8jm0p"; type = "gem"; }; - version = "0.6.0"; + version = "0.6.3"; }; rails = { dependencies = ["actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; @@ -4252,27 +4437,6 @@ }; version = "13.0.6"; }; - randexp = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1j742j7g107jgkvpsfq2b10d5xhsni5s8vxrp518d3karw7529ih"; - type = "gem"; - }; - version = "0.1.7"; - }; - rash_alt = { - dependencies = ["hashie"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "01qn9qrbi79mr4nyf1fqv3fjbh9ipx6r42vwfxmwrkpxp3ansjhx"; - type = "gem"; - }; - version = "0.4.12"; - }; rb-fsevent = { groups = ["default" "development" "test"]; platforms = []; @@ -4340,10 +4504,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13za43xb5xfg1xb1vwlvwx14jlmnk7jal5dqw8q9a5g13csx41sw"; + sha256 = "1habsrf67d3m5p12wc2bydsa7bj87r7w1266x8in59znf5wz4drf"; type = "gem"; }; - version = "1.4.0"; + version = "1.6.0"; }; recaptcha = { dependencies = ["json"]; @@ -4391,10 +4555,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xid9av3apfz5mszwqgl6v0n58g6038lsfdz0p53xb9ywpa5dcpc"; + sha256 = "0i4a8hxxcxci3n8hhlm9a8wa7a9m58r6sjvh4749v7362i8cy010"; type = "gem"; }; - version = "4.7.1"; + version = "4.8.0"; }; redis-actionpack = { dependencies = ["actionpack" "redis-rack" "redis-store"]; @@ -4413,10 +4577,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k65fr7f8ciq7d9nwc5ziw1d32zsxilgmqdlj3359rz5jgb0f5y8"; + sha256 = "04l61lpb3s2xkwj36l7b543lhciv19z514kxnmnbh5fg70grc8q9"; type = "gem"; }; - version = "1.8.1"; + version = "1.9.0"; }; redis-rack = { dependencies = ["rack" "redis-store"]; @@ -4445,10 +4609,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rfd3q17p7q7pa67844q8b16ipy6ksh8mkzynpm1zldqbb9x4xm0"; + sha256 = "0mm5sykyblc61a82zz3dag6yy3mvflj2z47060kjzjj5793blqzi"; type = "gem"; }; - version = "2.5.0"; + version = "2.6.0"; }; regexp_property_values = { groups = ["default"]; @@ -4615,10 +4779,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wwnfhxxvrlxlk1a3yxlb82k2f9lm0yn0598x7lk8fksaz4vv6mc"; + sha256 = "06wmcjsslx9vmw0bair46551ya8mb76csjyb59fxsmnkkp75jmh0"; type = "gem"; }; - version = "3.10.1"; + version = "3.10.2"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; @@ -4680,10 +4844,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15j52parvb8cgvl6s0pbxi2ywxrv6x0764g222kz5flz0s4mycbl"; + sha256 = "0pjckrh8q6sqxy38xw7f4ziylq1983k84xh927s6352pps68zj35"; type = "gem"; }; - version = "3.10.2"; + version = "3.10.3"; }; rspec_junit_formatter = { dependencies = ["rspec-core"]; @@ -4691,10 +4855,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1aynmrgnv26pkprrajvp7advb8nbh0x4pkwk6jwq8qmwzarzk21p"; + sha256 = "059bnq1gcwl9g93cqf13zpz38zk7jxaa43anzz06qkmfwrsfdpa0"; type = "gem"; }; - version = "0.4.1"; + version = "0.6.0"; }; rspec_profiling = { dependencies = ["activerecord" "pg" "rails" "sqlite3"]; @@ -4708,15 +4872,15 @@ version = "0.0.6"; }; rubocop = { - dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; - groups = ["default" "development" "test"]; + dependencies = ["json" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; + groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0phrig25dykgi42z6mf1abllh3ws6sv7awa82hzvvvbjx2xlzd3k"; + sha256 = "1b7zc3gissn5ki7zz2szg1mlxn8zqhgb3bdv96cl25w4mgf4g3in"; type = "gem"; }; - version = "0.93.1"; + version = "1.36.0"; }; rubocop-ast = { dependencies = ["parser"]; @@ -4757,10 +4921,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01aahh54r9mwhdj7v2s6kmkdm1k1n1z27dlknlbgm281ny1aswrk"; + sha256 = "0l87hrzjch2mdpwi0wf9b5nci7fmz5pfzqn5v44zi3rq80zawigf"; type = "gem"; }; - version = "1.9.2"; + version = "1.14.3"; }; rubocop-rails = { dependencies = ["activesupport" "rack" "rubocop"]; @@ -4768,32 +4932,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h656la1g644g54g3gidz45p6v8i1156nw6bi66cfx7078y1339d"; + sha256 = "0g342zj7b01z3l8k9hsvx0x2qyp74a59qz6j3a26pwzalr3ap48q"; type = "gem"; }; - version = "2.9.1"; + version = "2.15.2"; }; rubocop-rspec = { - dependencies = ["rubocop" "rubocop-ast"]; + dependencies = ["rubocop"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0albi9zn8zrz1bb105xkcn5xdv6q7i7r34h9m4jsj5ygsvkkh8kv"; + sha256 = "1y93hhhcs2j7z8gz8xagwwjs243rskryx4fm62piq9i58lnx4y4j"; type = "gem"; }; - version = "1.44.1"; + version = "2.12.1"; }; ruby-fogbugz = { - dependencies = ["crack"]; + dependencies = ["crack" "multipart-post"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jj0gpkycbrivkh2q3429vj6mbgx6axxisg69slj3c4mgvzfgchm"; + sha256 = "0mznsnhsgh1yg57j5gighr9vjricnix1l7ngf654k3v4fkjcs12y"; type = "gem"; }; - version = "0.2.1"; + version = "0.3.0"; }; ruby-magic = { dependencies = ["mini_portile2"]; @@ -4806,16 +4970,6 @@ }; version = "0.5.4"; }; - ruby-prof = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0g1j37fy53ly6351asfcnik033gwkp4kjma7lji1yklmj86d4dg7"; - type = "gem"; - }; - version = "1.3.1"; - }; ruby-progressbar = { groups = ["default" "development" "test"]; platforms = []; @@ -5149,10 +5303,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b06kw7frd8hrb7373pvfd39qap00ykkvipgymgwxfjzrgz0ag0d"; + sha256 = "0p2mj2jj5b9wqmpvkngx87lfr2qgwhqvwx38bmhl5aa29pc6z5kx"; type = "gem"; }; - version = "6.4.2"; + version = "6.5.7"; }; sidekiq-cron = { dependencies = ["fugit" "sidekiq"]; @@ -5160,10 +5314,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v9psfprq1x03b51mnpidfzilnm8b6spzkgap3pb8yga4pg2lq91"; + sha256 = "1jmh5vc2gdy0a161hgq0vlbwaviqj51pqzmgda4p2nyffg575nj7"; type = "gem"; }; - version = "1.4.0"; + version = "1.8.0"; }; sigdump = { groups = ["development" "test"]; @@ -5268,6 +5422,17 @@ }; version = "2.3.4"; }; + snaky_hash = { + dependencies = ["hashie" "version_gem"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pl70rh92wsn15q4lwzikzi7j5a00vm77bqjg07k4sgzx0wjx2zy"; + type = "gem"; + }; + version = "2.0.0"; + }; snowplow-tracker = { dependencies = ["contracts"]; groups = ["default"]; @@ -5285,10 +5450,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r8lr7gldwp57xqik4kims6w72q9ww34bral0j5z20a56s6gva8x"; + sha256 = "0smcpi3x87chkdqdclhgh36xlbwm7r44r58m3k1w4mcikdwlpjl7"; type = "gem"; }; - version = "0.46.0"; + version = "0.47.2"; }; sorted_set = { dependencies = ["rbtree" "set"]; @@ -5510,6 +5675,28 @@ }; version = "0.6.0"; }; + telesign = { + dependencies = ["net-http-persistent"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hjcaiy58zg7vpy5vsaaz6ss8w6nlkkvz1p758gdmd5wlxpfkinw"; + type = "gem"; + }; + version = "2.2.4"; + }; + telesignenterprise = { + dependencies = ["telesign"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cziz60q1pav635fln5xiag7vqvf992sk9xi1l5gxhm8ccra0izi"; + type = "gem"; + }; + version = "2.2.2"; + }; temple = { groups = ["default" "development" "test"]; platforms = []; @@ -5609,10 +5796,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rn8z8hda4h41a64l0zhkiwz2vxw9b1nb70gl37h1dg2k874yrlv"; + sha256 = "186nfbcsk0l4l86gvng1fw6jq6p6s7rc0caxr23b3pnbfb20y63v"; type = "gem"; }; - version = "2.0.10"; + version = "2.0.11"; }; timecop = { groups = ["development" "test"]; @@ -5650,10 +5837,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "153q7j2nj7y43iscbfcihmwlcydx6sbd65azs27kain0gncymd90"; + sha256 = "1kxykx7ywc0i3y4dwakz4b46dql4zc7h8b5w1hqhsqswq93s7i2i"; type = "gem"; }; - version = "1.31.0"; + version = "1.31.1"; }; toml-rb = { dependencies = ["citrus"]; @@ -5661,10 +5848,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x5j95w28vj85bzw98g1dyd4gm7xpli2fdvwwrgwlay7gb3wc5jh"; + sha256 = "19nr4wr5accc6l2y3avn7b02lqmk9035zxq42234k7fcqd5cbqm1"; type = "gem"; }; - version = "2.0.1"; + version = "2.2.0"; }; tomlrb = { groups = ["default"]; @@ -5957,10 +6144,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bwgbw56z2mhh2j044lgahrsiddibxx0r62r0cxvp0k4sjj9774j"; + sha256 = "104s7p4zp5yvf0bvbwd9mqmnkgz2z89h4hbvxi8pzd8d08c9a03b"; type = "gem"; }; - version = "1.0.0"; + version = "1.1.0"; }; version_sorter = { groups = ["default"]; @@ -5978,10 +6165,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0av6ngrfb1pyxwvy2lsp7m5lljk2vc9j7aabzw1zp70dh13hd261"; + sha256 = "1h4jhcp4h98lj5f7bn54313na25p9mhal0fw8d8a8m8lq6llgg8b"; type = "gem"; }; - version = "2.71.0"; + version = "2.74.1"; }; vmstat = { groups = ["default"]; diff --git a/pkgs/applications/version-management/gitlab/update-pg.patch b/pkgs/applications/version-management/gitlab/update-pg.patch deleted file mode 100644 index be8cd639df5..00000000000 --- a/pkgs/applications/version-management/gitlab/update-pg.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Gemfile.lock b/Gemfile.lock -index 9074b48c56b..57a1c924897 100644 ---- a/Gemfile.lock -+++ b/Gemfile.lock -@@ -1019,7 +1019,7 @@ GEM - tty-color (~> 0.5) - peek (1.1.0) - railties (>= 4.0.0) -- pg (1.4.1) -+ pg (1.4.3) - pg_query (2.1.4) - google-protobuf (>= 3.19.2) - plist (3.6.0) diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index 65c152a347e..0f322a5d375 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -23,9 +23,9 @@ VENDORED_GEMS = [ "omniauth-azure-oauth2", "omniauth-cas3", "omniauth-gitlab", - "omniauth-google-oauth2", "omniauth_crowd", "omniauth-salesforce", + "attr_encrypted", "mail-smtp_pool", "microsoft_graph_mailer", "ipynbdiff", @@ -159,11 +159,6 @@ def update_rubyenv(): gemfile = repo.get_file('Gemfile', rev) gemfile_lock = repo.get_file('Gemfile.lock', rev) - if "pg (1.4.1)" in gemfile_lock: - gemfile_lock = gemfile_lock.replace("pg (1.4.1)", "pg (1.4.3)") - else: - logger.info("Looks like pg was updated! Please remove update-pg.patch, as this will cause a build failure") - with open(rubyenv_dir / 'Gemfile', 'w') as f: f.write(re.sub(f'.*({"|".join(VENDORED_GEMS)}).*', "", gemfile)) |