From 532e63ef59bdf9f1a0c62d434e2e9e456431ecc2 Mon Sep 17 00:00:00 2001 From: Gabe Farrell <90876006+gabehf@users.noreply.github.com> Date: Tue, 14 May 2024 15:11:35 -0400 Subject: [PATCH] Merge pull request #5 from edcommonwealth/dependabot/bundler/rails-7.1.3.1 chore(deps): bump rails from 7.1.2 to 7.1.3.1 --- Gemfile | 2 +- Gemfile.lock | 148 ++++++++++++++++++++++++++------------------------- 2 files changed, 76 insertions(+), 74 deletions(-) diff --git a/Gemfile b/Gemfile index a2381a20..6f08f876 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ git_source(:github) do |repo_name| end # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem "rails", "~> 7.1.2" +gem "rails", "~> 7.1.3" gem "sprockets-rails" gem "pg" diff --git a/Gemfile.lock b/Gemfile.lock index 01475888..f3eefd7a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -12,35 +12,35 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (7.1.2) - actionpack (= 7.1.2) - activesupport (= 7.1.2) + actioncable (7.1.3.1) + actionpack (= 7.1.3.1) + activesupport (= 7.1.3.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.3.1) + actionpack (= 7.1.3.1) + activejob (= 7.1.3.1) + activerecord (= 7.1.3.1) + activestorage (= 7.1.3.1) + activesupport (= 7.1.3.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.3.1) + actionpack (= 7.1.3.1) + actionview (= 7.1.3.1) + activejob (= 7.1.3.1) + activesupport (= 7.1.3.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.3.1) + actionview (= 7.1.3.1) + activesupport (= 7.1.3.1) nokogiri (>= 1.8.5) racc rack (>= 2.2.4) @@ -48,37 +48,37 @@ GEM 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.3.1) + actionpack (= 7.1.3.1) + activerecord (= 7.1.3.1) + activestorage (= 7.1.3.1) + activesupport (= 7.1.3.1) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.1.2) - activesupport (= 7.1.2) + actionview (7.1.3.1) + activesupport (= 7.1.3.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.3.1) + activesupport (= 7.1.3.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.3.1) + activesupport (= 7.1.3.1) + activerecord (7.1.3.1) + activemodel (= 7.1.3.1) + activesupport (= 7.1.3.1) timeout (>= 0.4.0) activerecord-import (1.5.1) activerecord (>= 4.2) - activestorage (7.1.2) - actionpack (= 7.1.2) - activejob (= 7.1.2) - activerecord (= 7.1.2) - activesupport (= 7.1.2) + activestorage (7.1.3.1) + actionpack (= 7.1.3.1) + activejob (= 7.1.3.1) + activerecord (= 7.1.3.1) + activesupport (= 7.1.3.1) marcel (~> 1.0) - activesupport (7.1.2) + activesupport (7.1.3.1) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -103,7 +103,7 @@ GEM erubi (~> 1.4) parser (>= 2.4) smart_properties - bigdecimal (3.1.5) + bigdecimal (3.1.8) bootsnap (1.17.0) msgpack (~> 1.2) brakeman (6.1.0) @@ -122,7 +122,7 @@ GEM regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) coderay (1.1.3) - concurrent-ruby (1.2.2) + concurrent-ruby (1.2.3) connection_pool (2.4.1) crass (1.0.6) cssbundling-rails (1.3.3) @@ -145,8 +145,7 @@ GEM dotenv-rails (2.8.1) dotenv (= 2.8.1) railties (>= 3.2) - drb (2.2.0) - ruby2_keywords + drb (2.2.1) e2mmap (0.1.0) ed25519 (1.3.0) em-websocket (0.5.3) @@ -205,12 +204,12 @@ GEM tilt hashie (5.0.0) http_parser.rb (0.8.0) - i18n (1.14.1) + i18n (1.14.5) concurrent-ruby (~> 1.0) - io-console (0.7.1) - irb (1.11.0) - rdoc - reline (>= 0.3.8) + io-console (0.7.2) + irb (1.13.1) + rdoc (>= 4.0.0) + reline (>= 0.4.2) jaro_winkler (1.5.6) jbuilder (2.11.5) actionview (>= 5.0.0) @@ -242,17 +241,17 @@ GEM net-imap net-pop net-smtp - marcel (1.0.2) + marcel (1.0.4) matrix (0.4.2) method_source (1.0.0) mini_mime (1.1.5) - minitest (5.20.0) + minitest (5.22.3) msgpack (1.7.2) multi_json (1.15.0) mutex_m (0.2.0) nenv (0.3.0) nested_scaffold (1.1.0) - net-imap (0.4.8) + net-imap (0.4.11) date net-protocol net-pop (0.1.2) @@ -261,12 +260,12 @@ GEM timeout net-sftp (4.0.0) net-ssh (>= 5.0.0, < 8.0.0) - net-smtp (0.4.0) + net-smtp (0.5.0) net-protocol net-ssh (7.2.1) newrelic_rpm (9.6.0) base64 - nio4r (2.7.0) + nio4r (2.7.3) nokogiri (1.16.5-arm64-darwin) racc (~> 1.4) nokogiri (1.16.5-x86_64-darwin) @@ -301,7 +300,7 @@ GEM puma (6.4.0) nio4r (~> 2.0) racc (1.7.3) - rack (3.0.10) + rack (3.0.11) rack-livereload (0.5.1) rack rack-mini-profiler (3.3.0) @@ -315,20 +314,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) + rails (7.1.3.1) + actioncable (= 7.1.3.1) + actionmailbox (= 7.1.3.1) + actionmailer (= 7.1.3.1) + actionpack (= 7.1.3.1) + actiontext (= 7.1.3.1) + actionview (= 7.1.3.1) + activejob (= 7.1.3.1) + activemodel (= 7.1.3.1) + activerecord (= 7.1.3.1) + activestorage (= 7.1.3.1) + activesupport (= 7.1.3.1) bundler (>= 1.15.0) - railties (= 7.1.2) + railties (= 7.1.3.1) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -340,16 +339,16 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.1.2) - actionpack (= 7.1.2) - activesupport (= 7.1.2) + railties (7.1.3.1) + actionpack (= 7.1.3.1) + activesupport (= 7.1.3.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.2.1) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) @@ -362,7 +361,7 @@ GEM parser (~> 3.2.0) rainbow (>= 2.0, < 4.0) regexp_parser (2.8.3) - reline (0.3.9) + reline (0.5.7) io-console (~> 0.5) responders (3.1.1) actionpack (>= 5.2) @@ -405,7 +404,6 @@ GEM rubocop-ast (1.30.0) parser (>= 3.2.1.0) ruby-progressbar (1.13.0) - ruby2_keywords (0.0.5) rubyzip (2.3.2) seed_dump (3.3.1) activerecord (>= 4) @@ -453,8 +451,12 @@ GEM stimulus-rails (1.3.0) railties (>= 6.0.0) stringio (3.1.0) +<<<<<<< HEAD temple (0.10.3) thor (1.3.0) +======= + thor (1.3.1) +>>>>>>> 16f5808c (Merge pull request #5 from edcommonwealth/dependabot/bundler/rails-7.1.3.1) tilt (2.3.0) timecop (0.9.8) timeout (0.4.1) @@ -482,7 +484,7 @@ GEM xpath (3.2.0) nokogiri (~> 1.8) yard (0.9.34) - zeitwerk (2.6.12) + zeitwerk (2.6.14) PLATFORMS arm64-darwin-21 @@ -528,7 +530,7 @@ DEPENDENCIES puma (>= 6.4.0) rack-livereload rack-mini-profiler - rails (~> 7.1.2) + rails (~> 7.1.3) rails-controller-testing redis (~> 3.0) reline (~> 0.3.2)