From 3b0dd314be2eed25472e14100488809546329074 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Mon, 13 Mar 2023 09:52:52 +0000 Subject: [PATCH 1/6] Bump to modern ruby --- Gemfile | 2 +- Gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index f8a3a9f96..ad3c919ae 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' -ruby '2.6.7' +ruby '3.1.3' gem 'bundler' gem 'rails' diff --git a/Gemfile.lock b/Gemfile.lock index 2add8381a..88f6029d9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -632,7 +632,7 @@ DEPENDENCIES webmock RUBY VERSION - ruby 2.6.7p197 + ruby 3.1.3p185 BUNDLED WITH 2.2.16 From 2b6de0080ed1ff3cf26863804bb4fed593509692 Mon Sep 17 00:00:00 2001 From: gabrielburnworth Date: Fri, 14 Apr 2023 21:20:04 -0700 Subject: [PATCH 2/6] upgrade ruby to 3.0.6 --- .ruby-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ruby-version b/.ruby-version index 8122ad017..8ffc1ad64 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.8 \ No newline at end of file +3.0.6 \ No newline at end of file From 6b8b3cb77aa7d169b0bddb58931ee321d354eca5 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Sat, 29 Apr 2023 09:34:17 +0000 Subject: [PATCH 3/6] Add webrick --- Gemfile | 1 + Gemfile.lock | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Gemfile b/Gemfile index e1571b9cf..616441271 100644 --- a/Gemfile +++ b/Gemfile @@ -41,6 +41,7 @@ gem 'rails_admin' gem 'rollbar' gem 'sass-rails' gem 'utf8-cleaner' +gem 'webrick' # Asset management using bower # https://rails-assets.org/ diff --git a/Gemfile.lock b/Gemfile.lock index 3093bb82b..a718ad32c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -559,6 +559,7 @@ GEM addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) + webrick (1.8.1) websocket (1.2.8) websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) @@ -648,6 +649,7 @@ DEPENDENCIES utf8-cleaner vcr webmock + webrick BUNDLED WITH 2.2.16 From c98c9c777bbec31ee7f867e0b676be77939cc6c5 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Sat, 29 Apr 2023 09:45:25 +0000 Subject: [PATCH 4/6] Bump compass-rails --- Gemfile.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a718ad32c..5ba9436e3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -134,7 +134,7 @@ GEM capybara (>= 2.5.0) case_transform (0.2) activesupport - chunky_png (1.3.11) + chunky_png (1.4.0) climate_control (0.2.0) coderay (1.1.3) coffee-rails (5.0.0) @@ -156,7 +156,7 @@ GEM sass (>= 3.3.0, < 3.5) compass-import-once (1.0.5) sass (>= 3.2, < 3.5) - compass-rails (3.1.0) + compass-rails (4.0.0) compass (~> 1.0.0) sass-rails (< 5.1) sprockets (< 4.0) @@ -223,7 +223,7 @@ GEM multipart-post (>= 1.2, < 3) faraday_middleware (1.0.0) faraday (~> 1.0) - ffi (1.12.2) + ffi (1.15.5) font-awesome-sass (5.13.0) sassc (>= 1.11) foundation-rails (5.5.2.1) @@ -329,7 +329,7 @@ GEM mongoid_taggable (1.1.1) mongoid (>= 3) rake - multi_json (1.14.1) + multi_json (1.15.0) multipart-post (2.1.1) mutations (0.9.0) activesupport @@ -437,8 +437,8 @@ GEM rainbow (3.0.0) rake (13.0.6) rate_throttle_client (0.1.2) - rb-fsevent (0.10.3) - rb-inotify (0.10.0) + rb-fsevent (0.11.2) + rb-inotify (0.10.1) ffi (~> 1.0) regexp_parser (2.8.0) remotipart (1.4.4) @@ -478,8 +478,8 @@ GEM ruby-progressbar (1.11.0) rubyzip (2.3.2) sass (3.4.25) - sass-rails (5.0.7) - railties (>= 4.0.0, < 6) + sass-rails (5.0.8) + railties (>= 5.2.0) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) @@ -531,7 +531,7 @@ GEM rack (>= 1, < 3) thor (1.2.1) thread_safe (0.3.6) - tilt (2.0.10) + tilt (2.1.0) timeout (0.3.2) tins (1.21.1) travis (1.9.1) From e47fc89ca1186f2ff0752e479b85e6ac1464ef27 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Sat, 29 Apr 2023 09:55:53 +0000 Subject: [PATCH 5/6] Bump faraday --- Gemfile.lock | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c67d6fe03..702d0fb33 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -218,8 +218,29 @@ GEM railties (>= 5.0.0) faker (3.2.0) i18n (>= 1.8.11, < 2) - faraday (1.0.1) - multipart-post (>= 1.2, < 3) + faraday (1.10.3) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) faraday_middleware (1.0.0) faraday (~> 1.0) ffi (1.15.5) @@ -329,7 +350,7 @@ GEM mongoid (>= 3) rake multi_json (1.15.0) - multipart-post (2.1.1) + multipart-post (2.3.0) mutations (0.9.0) activesupport nested_form (0.3.2) @@ -475,6 +496,7 @@ GEM rubocop-ast (1.4.0) parser (>= 2.7.1.5) ruby-progressbar (1.11.0) + ruby2_keywords (0.0.5) rubyzip (2.3.2) sass (3.4.25) sass-rails (5.0.8) From 27580d35df3a2a895405521f20add52aa2d5b1b4 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Sat, 29 Apr 2023 10:04:20 +0000 Subject: [PATCH 6/6] Bump --- Gemfile.lock | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 702d0fb33..93993b0db 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -203,8 +203,6 @@ GEM multi_json erubi (1.12.0) erubis (2.7.0) - ethon (0.12.0) - ffi (>= 1.3.0) eventmachine (1.2.7) exception_notification (4.5.0) actionmailer (>= 5.2, < 8) @@ -241,7 +239,7 @@ GEM faraday-patron (1.0.0) faraday-rack (1.0.0) faraday-retry (1.0.3) - faraday_middleware (1.0.0) + faraday_middleware (1.2.0) faraday (~> 1.0) ffi (1.15.5) font-awesome-sass (5.13.0) @@ -249,7 +247,7 @@ GEM foundation-rails (5.5.2.1) railties (>= 3.1.0) sass (>= 3.3.0, < 3.5) - gh (0.17.0) + gh (0.18.0) activesupport (~> 5.0) addressable (~> 2.4) faraday (~> 1.0) @@ -270,7 +268,7 @@ GEM moneta multi_json (>= 1.9.2) high_voltage (3.1.2) - highline (2.0.3) + highline (2.1.0) i18n (1.13.0) concurrent-ruby (~> 1.0) jmespath (1.6.1) @@ -280,7 +278,8 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (6.0.1) railties (>= 3.2.16) - json (2.3.0) + json (2.6.3) + json_pure (2.6.3) jsonapi-renderer (0.2.2) jsonapi-serializers (1.0.1) activesupport @@ -555,17 +554,14 @@ GEM tilt (2.1.0) timeout (0.3.2) tins (1.21.1) - travis (1.9.1) + travis (1.11.1) faraday (~> 1.0) faraday_middleware (~> 1.0) gh (~> 0.13) highline (~> 2.0) - json (~> 2.3) + json_pure (~> 2.3) launchy (~> 2.1, < 2.5.0) pusher-client (~> 0.4) - typhoeus (~> 0.6, >= 0.6.8) - typhoeus (0.8.0) - ethon (>= 0.8.0) tzinfo (1.2.11) thread_safe (~> 0.1) uglifier (4.2.0) @@ -581,7 +577,7 @@ GEM crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) webrick (1.8.1) - websocket (1.2.8) + websocket (1.2.9) websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5)