From d2e5cd46550776ea1727de87a6f1d5dcf8cc970c Mon Sep 17 00:00:00 2001 From: Sebastian Serth Date: Sat, 11 Nov 2023 20:39:12 +0100 Subject: [PATCH] Bundle update --- Gemfile | 6 +- Gemfile.lock | 154 +++++++++++++++++++++++++-------------------------- package.json | 8 +-- yarn.lock | 103 ++++++++++++---------------------- 4 files changed, 114 insertions(+), 157 deletions(-) diff --git a/Gemfile b/Gemfile index 8ad7636a..a6c03e24 100644 --- a/Gemfile +++ b/Gemfile @@ -36,10 +36,8 @@ gem 'proformaxml', '1.0.0' gem 'prometheus_exporter' gem 'puma' gem 'pundit' -# TODO: Temporary switch to Rails 7.1 branch until the next release. -# See https://github.com/rails/rails/pull/49778 -gem 'rails', github: 'rails/rails', branch: '7-1-stable' -gem 'rails_admin', '< 4.0.0' +gem 'rails', '~> 7.1.0' +gem 'rails_admin' gem 'rails-i18n' gem 'rails-timeago' gem 'ransack' diff --git a/Gemfile.lock b/Gemfile.lock index ac61116d..fcc559c9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,37 +1,39 @@ -GIT - remote: https://github.com/rails/rails.git - revision: 28deb8bb7a6071573e43a463e766ac6eeeb82601 - branch: 7-1-stable +GEM + remote: https://rubygems.org/ specs: - actioncable (7.1.1) - actionpack (= 7.1.1) - activesupport (= 7.1.1) + actioncable (7.1.2) + actionpack (= 7.1.2) + activesupport (= 7.1.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.1.1) - actionpack (= 7.1.1) - activejob (= 7.1.1) - activerecord (= 7.1.1) - activestorage (= 7.1.1) - activesupport (= 7.1.1) + actioncable-enhanced-postgresql-adapter (1.0.1) + actioncable (>= 6.0) + connection_pool (>= 2.2.5) + pg (~> 1.5) + actionmailbox (7.1.2) + actionpack (= 7.1.2) + activejob (= 7.1.2) + activerecord (= 7.1.2) + activestorage (= 7.1.2) + activesupport (= 7.1.2) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.1.1) - actionpack (= 7.1.1) - actionview (= 7.1.1) - activejob (= 7.1.1) - activesupport (= 7.1.1) + actionmailer (7.1.2) + actionpack (= 7.1.2) + actionview (= 7.1.2) + activejob (= 7.1.2) + activesupport (= 7.1.2) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.2) - actionpack (7.1.1) - actionview (= 7.1.1) - activesupport (= 7.1.1) + actionpack (7.1.2) + actionview (= 7.1.2) + activesupport (= 7.1.2) nokogiri (>= 1.8.5) racc rack (>= 2.2.4) @@ -39,35 +41,39 @@ GIT rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actiontext (7.1.1) - actionpack (= 7.1.1) - activerecord (= 7.1.1) - activestorage (= 7.1.1) - activesupport (= 7.1.1) + actiontext (7.1.2) + actionpack (= 7.1.2) + activerecord (= 7.1.2) + activestorage (= 7.1.2) + activesupport (= 7.1.2) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.1.1) - activesupport (= 7.1.1) + actionview (7.1.2) + activesupport (= 7.1.2) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activejob (7.1.1) - activesupport (= 7.1.1) + activejob (7.1.2) + activesupport (= 7.1.2) globalid (>= 0.3.6) - activemodel (7.1.1) - activesupport (= 7.1.1) - activerecord (7.1.1) - activemodel (= 7.1.1) - activesupport (= 7.1.1) + activemodel (7.1.2) + activesupport (= 7.1.2) + activemodel-serializers-xml (1.0.2) + activemodel (> 5.x) + activesupport (> 5.x) + builder (~> 3.1) + activerecord (7.1.2) + activemodel (= 7.1.2) + activesupport (= 7.1.2) timeout (>= 0.4.0) - activestorage (7.1.1) - actionpack (= 7.1.1) - activejob (= 7.1.1) - activerecord (= 7.1.1) - activesupport (= 7.1.1) + activestorage (7.1.2) + actionpack (= 7.1.2) + activejob (= 7.1.2) + activerecord (= 7.1.2) + activesupport (= 7.1.2) marcel (~> 1.0) - activesupport (7.1.1) + activesupport (7.1.2) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -77,40 +83,6 @@ GIT minitest (>= 5.1) mutex_m tzinfo (~> 2.0) - rails (7.1.1) - actioncable (= 7.1.1) - actionmailbox (= 7.1.1) - actionmailer (= 7.1.1) - actionpack (= 7.1.1) - actiontext (= 7.1.1) - actionview (= 7.1.1) - activejob (= 7.1.1) - activemodel (= 7.1.1) - activerecord (= 7.1.1) - activestorage (= 7.1.1) - activesupport (= 7.1.1) - bundler (>= 1.15.0) - railties (= 7.1.1) - railties (7.1.1) - actionpack (= 7.1.1) - activesupport (= 7.1.1) - irb - rackup (>= 1.0.0) - rake (>= 12.2) - thor (~> 1.0, >= 1.2.2) - zeitwerk (~> 2.6) - -GEM - remote: https://rubygems.org/ - specs: - actioncable-enhanced-postgresql-adapter (1.0.1) - actioncable (>= 6.0) - connection_pool (>= 2.2.5) - pg (~> 1.5) - activemodel-serializers-xml (1.0.2) - activemodel (> 5.x) - activesupport (> 5.x) - builder (~> 3.1) addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) amq-protocol (2.3.2) @@ -220,7 +192,7 @@ GEM rexml influxdb (0.8.1) io-console (0.6.0) - irb (1.8.3) + irb (1.9.0) rdoc reline (>= 0.3.8) jbuilder (2.11.5) @@ -354,6 +326,20 @@ GEM rackup (2.1.0) rack (>= 3) webrick (~> 1.8) + rails (7.1.2) + actioncable (= 7.1.2) + actionmailbox (= 7.1.2) + actionmailer (= 7.1.2) + actionpack (= 7.1.2) + actiontext (= 7.1.2) + actionview (= 7.1.2) + activejob (= 7.1.2) + activemodel (= 7.1.2) + activerecord (= 7.1.2) + activestorage (= 7.1.2) + activesupport (= 7.1.2) + bundler (>= 1.15.0) + railties (= 7.1.2) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -377,6 +363,14 @@ GEM nested_form (~> 0.3) rails (>= 6.0, < 8) turbo-rails (~> 1.0) + railties (7.1.2) + actionpack (= 7.1.2) + activesupport (= 7.1.2) + irb + rackup (>= 1.0.0) + rake (>= 12.2) + thor (~> 1.0, >= 1.2.2) + zeitwerk (~> 2.6) rainbow (3.1.1) rake (13.1.0) ransack (4.1.1) @@ -485,7 +479,7 @@ GEM simplecov_json_formatter (0.1.4) simpleidn (0.2.1) unf (~> 0.1.4) - slim (5.1.1) + slim (5.2.0) temple (~> 0.10.0) tilt (>= 2.1.0) slim-rails (3.6.3) @@ -534,7 +528,7 @@ GEM concurrent-ruby (~> 1.0) unf (0.1.4) unf_ext - unf_ext (0.0.8.2) + unf_ext (0.0.9) unicode-display_width (2.5.0) version_gem (1.1.3) web-console (4.2.1) @@ -608,11 +602,11 @@ DEPENDENCIES puma pundit rack-mini-profiler - rails! + rails (~> 7.1.0) rails-controller-testing rails-i18n rails-timeago - rails_admin (< 4.0.0) + rails_admin ransack rspec-collection_matchers rspec-github diff --git a/package.json b/package.json index 761f9cdb..73a3593c 100644 --- a/package.json +++ b/package.json @@ -5,11 +5,11 @@ "@babel/core": "^7.23.3", "@babel/plugin-transform-runtime": "^7.23.3", "@babel/preset-env": "^7.23.3", - "@babel/runtime": "^7.22.15", + "@babel/runtime": "^7.23.2", "@egjs/hammerjs": "^2.0.17", "@fortawesome/fontawesome-free": "^6.4.2", "@popperjs/core": "^2.11.8", - "@sentry/browser": "^7.60.1", + "@sentry/browser": "^7.80.0", "@sentry/core": "^7.80.0", "@sentry/integrations": "^7.80.0", "@sentry/utils": "^7.80.0", @@ -24,7 +24,7 @@ "css-minimizer-webpack-plugin": "^5.0.1", "d3": "^7.8.5", "d3-tip": "^0.9.1", - "highlight.js": "^11.8.0", + "highlight.js": "^11.9.0", "i18n-js": "^4.3.2", "jquery": "^3.7.1", "jquery-ui": "^1.13.2", @@ -54,7 +54,7 @@ "webpack-cli": "^5.1.4", "webpack-merge": "^5.10.0", "webpack-sources": "^3.2.3", - "webpack-subresource-integrity": "^5.1.0", + "webpack-subresource-integrity": "^5.2.0-rc.1", "xss": "^1.0.14" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index ab93a70a..095f83b1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1314,7 +1314,7 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.22.15, @babel/runtime@npm:^7.8.4": +"@babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.8.4": version: 7.23.2 resolution: "@babel/runtime@npm:7.23.2" dependencies: @@ -1547,37 +1547,27 @@ __metadata: languageName: node linkType: hard -"@sentry-internal/tracing@npm:7.75.1": - version: 7.75.1 - resolution: "@sentry-internal/tracing@npm:7.75.1" +"@sentry-internal/tracing@npm:7.80.0": + version: 7.80.0 + resolution: "@sentry-internal/tracing@npm:7.80.0" dependencies: - "@sentry/core": "npm:7.75.1" - "@sentry/types": "npm:7.75.1" - "@sentry/utils": "npm:7.75.1" - checksum: b7fc1469996a1f6f9d72451a9f1c16fd9fdec4b15cd3ad2c055a769f8f7fe6602dc7ec1e48bf8318429c77f6663f09b266db25c693ac76bad9c0d2f3b0fc91e6 + "@sentry/core": "npm:7.80.0" + "@sentry/types": "npm:7.80.0" + "@sentry/utils": "npm:7.80.0" + checksum: bafd4bda3d8d98cb6a36f5b604a1de9d9478b5301c02683915617809ef52b81e7132d2a68288ef79f965e41e37e16e1d13ec57e47fa2b9f36c202493eae7dd2b languageName: node linkType: hard -"@sentry/browser@npm:^7.60.1": - version: 7.75.1 - resolution: "@sentry/browser@npm:7.75.1" +"@sentry/browser@npm:^7.80.0": + version: 7.80.0 + resolution: "@sentry/browser@npm:7.80.0" dependencies: - "@sentry-internal/tracing": "npm:7.75.1" - "@sentry/core": "npm:7.75.1" - "@sentry/replay": "npm:7.75.1" - "@sentry/types": "npm:7.75.1" - "@sentry/utils": "npm:7.75.1" - checksum: 9253a350593ab631824a1f96b5306787985b1713564154e3d4c8af72ebf73de3c53c2185f9e35f58526b63c2ba056fa24292a6ed298c56adaf2bf86f4cb66613 - languageName: node - linkType: hard - -"@sentry/core@npm:7.75.1": - version: 7.75.1 - resolution: "@sentry/core@npm:7.75.1" - dependencies: - "@sentry/types": "npm:7.75.1" - "@sentry/utils": "npm:7.75.1" - checksum: 9c9127ce97ffaf45107fad705edb67f3523b2225ed630b16bdc8229a5a26f2138a08055d9861dd5c0cfa0333c50eddd7d2360aa7bae76c72e000d5d615958d21 + "@sentry-internal/tracing": "npm:7.80.0" + "@sentry/core": "npm:7.80.0" + "@sentry/replay": "npm:7.80.0" + "@sentry/types": "npm:7.80.0" + "@sentry/utils": "npm:7.80.0" + checksum: ab15b4188d648043f101f8598ea5249e512d365c42f5fd1163721e9b21af28ec9ef9b23bc332d434427163e1aa6fdbcaa15850e7263c76d4fc0b5ea4b55b04e3 languageName: node linkType: hard @@ -1603,22 +1593,15 @@ __metadata: languageName: node linkType: hard -"@sentry/replay@npm:7.75.1": - version: 7.75.1 - resolution: "@sentry/replay@npm:7.75.1" +"@sentry/replay@npm:7.80.0": + version: 7.80.0 + resolution: "@sentry/replay@npm:7.80.0" dependencies: - "@sentry-internal/tracing": "npm:7.75.1" - "@sentry/core": "npm:7.75.1" - "@sentry/types": "npm:7.75.1" - "@sentry/utils": "npm:7.75.1" - checksum: cef6e789fd104f62e671d9098f3fd6ca1b0c23ce6e666466fcb69a928227bc1b40498a8e1f8319b0c50d836817de5234bb1f3b1ed02782cdcb73e8d348d81c65 - languageName: node - linkType: hard - -"@sentry/types@npm:7.75.1": - version: 7.75.1 - resolution: "@sentry/types@npm:7.75.1" - checksum: dee97fd435f431271be2b4e5752226a5f03f84aaa995807052f772b177c6112d42884f55242b8749eae1928009cde485113dc82bd94bc6d5f6440cc29ab2e5a9 + "@sentry-internal/tracing": "npm:7.80.0" + "@sentry/core": "npm:7.80.0" + "@sentry/types": "npm:7.80.0" + "@sentry/utils": "npm:7.80.0" + checksum: 32e9c5e469eae7ea0c505545914620ded683eac563f84bab3924582d099180b71af47ec105de2eab3a24aa2f3d04472e9762683abeae8efe82e9775b5ecea44b languageName: node linkType: hard @@ -1629,15 +1612,6 @@ __metadata: languageName: node linkType: hard -"@sentry/utils@npm:7.75.1": - version: 7.75.1 - resolution: "@sentry/utils@npm:7.75.1" - dependencies: - "@sentry/types": "npm:7.75.1" - checksum: d6276ca251fff2509994eef791af91564d68f022add53b02b0c8bb533e1a05cbec44a718a5a421d5f5bf1a4aad2ace762b58562f32d42e37c2d5ab0ef3fac993 - languageName: node - linkType: hard - "@sentry/utils@npm:7.80.0, @sentry/utils@npm:^7.80.0": version: 7.80.0 resolution: "@sentry/utils@npm:7.80.0" @@ -2656,11 +2630,11 @@ __metadata: "@babel/core": "npm:^7.23.3" "@babel/plugin-transform-runtime": "npm:^7.23.3" "@babel/preset-env": "npm:^7.23.3" - "@babel/runtime": "npm:^7.22.15" + "@babel/runtime": "npm:^7.23.2" "@egjs/hammerjs": "npm:^2.0.17" "@fortawesome/fontawesome-free": "npm:^6.4.2" "@popperjs/core": "npm:^2.11.8" - "@sentry/browser": "npm:^7.60.1" + "@sentry/browser": "npm:^7.80.0" "@sentry/core": "npm:^7.80.0" "@sentry/integrations": "npm:^7.80.0" "@sentry/utils": "npm:^7.80.0" @@ -2675,7 +2649,7 @@ __metadata: css-minimizer-webpack-plugin: "npm:^5.0.1" d3: "npm:^7.8.5" d3-tip: "npm:^0.9.1" - highlight.js: "npm:^11.8.0" + highlight.js: "npm:^11.9.0" i18n-js: "npm:^4.3.2" jquery: "npm:^3.7.1" jquery-ui: "npm:^1.13.2" @@ -2706,7 +2680,7 @@ __metadata: webpack-dev-server: "npm:^4.15.1" webpack-merge: "npm:^5.10.0" webpack-sources: "npm:^3.2.3" - webpack-subresource-integrity: "npm:^5.1.0" + webpack-subresource-integrity: "npm:^5.2.0-rc.1" xss: "npm:^1.0.14" languageName: unknown linkType: soft @@ -4157,7 +4131,7 @@ __metadata: languageName: node linkType: hard -"highlight.js@npm:^11.8.0": +"highlight.js@npm:^11.9.0": version: 11.9.0 resolution: "highlight.js@npm:11.9.0" checksum: 27cfa8717dc9d200aecbdb383eb122d5f45ce715d2f468583785d36fbfe5076ce033abb02486dc13b407171721cda6f474ed3f3a5a8e8c3d91367fa5f51ee374 @@ -6810,13 +6784,6 @@ __metadata: languageName: node linkType: hard -"typed-assert@npm:^1.0.8": - version: 1.0.9 - resolution: "typed-assert@npm:1.0.9" - checksum: 9a31b03e6a5f07f13267f34dbbd125274b3b9e5107b906d76b2e401f6f60ebdea01124be8e3c064549938f57ac4e1b4f5a9c04e32bc8974b2f8cc74825e8b83e - languageName: node - linkType: hard - "underscore@npm:^1.13.6": version: 1.13.6 resolution: "underscore@npm:1.13.6" @@ -7134,18 +7101,16 @@ __metadata: languageName: node linkType: hard -"webpack-subresource-integrity@npm:^5.1.0": - version: 5.1.0 - resolution: "webpack-subresource-integrity@npm:5.1.0" - dependencies: - typed-assert: "npm:^1.0.8" +"webpack-subresource-integrity@npm:^5.2.0-rc.1": + version: 5.2.0-rc.1 + resolution: "webpack-subresource-integrity@npm:5.2.0-rc.1" peerDependencies: html-webpack-plugin: ">= 5.0.0-beta.1 < 6" webpack: ^5.12.0 peerDependenciesMeta: html-webpack-plugin: optional: true - checksum: 7def5d995a43fc5e60097084e68145359fbeb47b96cb9c87ee811d70c5eb99766c28974ef28f09ae6b1d1b3cd2b7c35838b36206f1c39d090a8f531cd1fbbf6a + checksum: 333d45ce9a0e9b5919777abebabe3495fff593569bf979eedd5433cef4f5b3d801625a285f9bab2a3559d0c69e39df83e27fe8272fcf11ba55968ee26611cb16 languageName: node linkType: hard