From d922d9d16db119db0885860ac72590b6b8642144 Mon Sep 17 00:00:00 2001 From: Zach Margolis Date: Wed, 15 Nov 2023 15:56:08 -0800 Subject: [PATCH] Revert "[Snyk] Security upgrade rails from 7.1.1 to 7.1.2 (#9577)" This reverts commit 4055b1bd9db5c562ba343716dfdbae3d7d33a2a5. --- Gemfile | 2 +- Gemfile.lock | 137 +++++++++++++++++++++++++-------------------------- 2 files changed, 68 insertions(+), 71 deletions(-) diff --git a/Gemfile b/Gemfile index 47ed042e2d4..6fa687cbcb2 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" } ruby "~> #{File.read(File.join(__dir__, '.ruby-version')).strip}" -gem 'rails', '~> 7.1.2' +gem 'rails', '~> 7.1.0' gem 'activerecord-postgis-adapter', '~> 9.0' gem 'ahoy_matey', '~> 3.0' diff --git a/Gemfile.lock b/Gemfile.lock index cfefda55dbe..964d7d9106d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -60,74 +60,73 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (7.1.2) - actionpack (= 7.1.2) - activesupport (= 7.1.2) + actioncable (7.1.1) + actionpack (= 7.1.1) + activesupport (= 7.1.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.1.2) - actionpack (= 7.1.2) - activejob (= 7.1.2) - activerecord (= 7.1.2) - activestorage (= 7.1.2) - activesupport (= 7.1.2) + actionmailbox (7.1.1) + actionpack (= 7.1.1) + activejob (= 7.1.1) + activerecord (= 7.1.1) + activestorage (= 7.1.1) + activesupport (= 7.1.1) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.1.2) - actionpack (= 7.1.2) - actionview (= 7.1.2) - activejob (= 7.1.2) - activesupport (= 7.1.2) + actionmailer (7.1.1) + actionpack (= 7.1.1) + actionview (= 7.1.1) + activejob (= 7.1.1) + activesupport (= 7.1.1) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.2) - actionpack (7.1.2) - actionview (= 7.1.2) - activesupport (= 7.1.2) + actionpack (7.1.1) + actionview (= 7.1.1) + activesupport (= 7.1.1) nokogiri (>= 1.8.5) - racc rack (>= 2.2.4) rack-session (>= 1.0.1) rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actiontext (7.1.2) - actionpack (= 7.1.2) - activerecord (= 7.1.2) - activestorage (= 7.1.2) - activesupport (= 7.1.2) + actiontext (7.1.1) + actionpack (= 7.1.1) + activerecord (= 7.1.1) + activestorage (= 7.1.1) + activesupport (= 7.1.1) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.1.2) - activesupport (= 7.1.2) + actionview (7.1.1) + activesupport (= 7.1.1) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activejob (7.1.2) - activesupport (= 7.1.2) + activejob (7.1.1) + activesupport (= 7.1.1) globalid (>= 0.3.6) - activemodel (7.1.2) - activesupport (= 7.1.2) - activerecord (7.1.2) - activemodel (= 7.1.2) - activesupport (= 7.1.2) + activemodel (7.1.1) + activesupport (= 7.1.1) + activerecord (7.1.1) + activemodel (= 7.1.1) + activesupport (= 7.1.1) timeout (>= 0.4.0) activerecord-postgis-adapter (9.0.1) activerecord (~> 7.1.0) rgeo-activerecord (~> 7.0.0) - activestorage (7.1.2) - actionpack (= 7.1.2) - activejob (= 7.1.2) - activerecord (= 7.1.2) - activesupport (= 7.1.2) + activestorage (7.1.1) + actionpack (= 7.1.1) + activejob (= 7.1.1) + activerecord (= 7.1.1) + activesupport (= 7.1.1) marcel (~> 1.0) - activesupport (7.1.2) + activesupport (7.1.1) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -194,7 +193,7 @@ GEM thread_safe (~> 0.3, >= 0.3.1) barby (0.6.8) base32-crockford (0.1.0) - base64 (0.2.0) + base64 (0.1.1) bcrypt (3.1.19) benchmark-ips (2.12.0) better_errors (2.10.1) @@ -253,7 +252,7 @@ GEM addressable cssbundling-rails (1.0.0) railties (>= 6.0.0) - date (3.3.4) + date (3.3.3) dead_end (4.0.0) derailed_benchmarks (2.1.2) benchmark-ips (~> 2) @@ -281,7 +280,7 @@ GEM dotiw (5.3.2) activesupport i18n - drb (2.2.0) + drb (2.1.1) ruby2_keywords dumb_delegator (1.0.0) email_spec (2.2.2) @@ -356,7 +355,7 @@ GEM terminal-table (>= 1.5.1) ice_nine (0.11.2) io-console (0.6.0) - irb (1.9.0) + irb (1.8.3) rdoc reline (>= 0.3.8) jmespath (1.6.2) @@ -412,13 +411,13 @@ GEM minitest (5.20.0) msgpack (1.7.2) multiset (0.5.3) - mutex_m (0.2.0) - net-imap (0.4.4) + mutex_m (0.1.2) + net-imap (0.4.2) date net-protocol net-pop (0.1.2) net-protocol - net-protocol (0.2.2) + net-protocol (0.2.1) timeout net-sftp (3.0.0) net-ssh (>= 5.0.0, < 7.0.0) @@ -469,13 +468,12 @@ GEM yard (~> 0.9.11) pry-rails (0.3.9) pry (>= 0.10.4) - psych (5.1.1.1) - stringio + psych (4.0.2) public_suffix (5.0.3) puma (5.6.7) nio4r (~> 2.0) raabro (1.4.0) - racc (1.7.3) + racc (1.7.2) rack (2.2.8) rack-attack (6.5.0) rack (>= 1.0, < 3) @@ -497,20 +495,20 @@ GEM rackup (1.0.0) rack (< 3) webrick - 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) + 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.2) + railties (= 7.1.1) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -525,20 +523,20 @@ GEM rails-i18n (7.0.6) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (7.1.2) - actionpack (= 7.1.2) - activesupport (= 7.1.2) + 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) rainbow (3.1.1) - rake (13.1.0) + rake (13.0.6) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rdoc (6.6.0) + rdoc (6.5.0) psych (>= 4.0.0) redacted_struct (1.1.0) redcarpet (3.6.0) @@ -547,7 +545,7 @@ GEM redis-client (0.14.1) connection_pool regexp_parser (2.8.2) - reline (0.4.0) + reline (0.3.9) io-console (~> 0.5) request_store (1.5.1) rack (>= 1.4) @@ -659,7 +657,6 @@ GEM unf (~> 0.1.4) smart_properties (1.17.0) stringex (2.8.5) - stringio (3.0.9) strong_migrations (1.6.4) activerecord (>= 5.2) subprocess (1.5.5) @@ -668,7 +665,7 @@ GEM unicode-display_width (>= 1.1.1, < 3) thor (1.3.0) thread_safe (0.3.6) - timeout (0.4.1) + timeout (0.4.0) tpm-key_attestation (0.11.0) bindata (~> 2.4) openssl (> 2.0, < 3.1) @@ -809,7 +806,7 @@ DEPENDENCIES rack-test (>= 1.1.0) rack-timeout rack_session_access (>= 0.2.0) - rails (~> 7.1.2) + rails (~> 7.1.0) rails-controller-testing (>= 1.0.4) redacted_struct redis (>= 3.2.0)