From 9913ab7795b26661729587ba47c5c3bc248639db Mon Sep 17 00:00:00 2001 From: Sam Davies Date: Tue, 12 Mar 2024 12:28:56 +0000 Subject: [PATCH 1/3] WEB-6887: Easy gem upgrades --- Gemfile.lock | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e9d526c..694242b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -14,9 +14,9 @@ GIT GEM remote: https://rubygems.org/ specs: - activemodel (7.1.3) - activesupport (= 7.1.3) - activesupport (7.1.3) + activemodel (7.1.3.2) + activesupport (= 7.1.3.2) + activesupport (7.1.3.2) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -30,12 +30,11 @@ GEM public_suffix (>= 2.0.2, < 6.0) ast (2.4.2) aws-eventstream (1.3.0) - aws-partitions (1.892.0) - aws-sdk-core (3.191.2) + aws-partitions (1.896.0) + aws-sdk-core (3.191.3) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) - base64 jmespath (~> 1, >= 1.6.1) aws-sdk-kms (1.77.0) aws-sdk-core (~> 3, >= 3.191.0) @@ -57,8 +56,7 @@ GEM connection_pool (2.4.1) daemons (1.4.1) diff-lcs (1.5.1) - drb (2.2.0) - ruby2_keywords + drb (2.2.1) e2mmap (0.1.0) em-websocket (0.5.3) eventmachine (>= 0.12.9) @@ -70,11 +68,11 @@ GEM net-http faraday-retry (2.2.0) faraday (~> 2.0) - ferrum (0.14) + ferrum (0.15) addressable (~> 2.5) concurrent-ruby (~> 1.1) webrick (~> 1.7) - websocket-driver (>= 0.6, < 0.8) + websocket-driver (~> 0.7) ffi (1.16.3) formatador (1.1.0) git (1.19.1) @@ -97,7 +95,7 @@ GEM guard-compat (~> 1.0) multi_json (~> 1.8) http_parser.rb (0.8.0) - i18n (1.14.1) + i18n (1.14.4) concurrent-ruby (~> 1.0) jaro_winkler (1.5.6) jmespath (1.6.2) @@ -107,7 +105,7 @@ GEM kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.3) - listen (3.8.0) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) lumberjack (1.2.10) @@ -140,7 +138,7 @@ GEM method_source (~> 1.0) public_suffix (5.0.4) racc (1.7.3) - rack (2.2.8) + rack (2.2.8.1) rack-livereload (0.5.2) rack (< 3) rack-protection (3.2.0) @@ -161,7 +159,7 @@ GEM reverse_markdown (2.1.1) nokogiri rexml (3.2.6) - rubocop (1.60.2) + rubocop (1.62.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -169,11 +167,11 @@ GEM rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.30.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.30.0) - parser (>= 3.2.1.0) + rubocop-ast (1.31.2) + parser (>= 3.3.0.4) ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) sass-embedded (1.62.1) @@ -209,7 +207,7 @@ GEM daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - thor (1.3.0) + thor (1.3.1) tilt (2.3.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) @@ -219,7 +217,7 @@ GEM websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - yard (0.9.34) + yard (0.9.36) zeitwerk (2.6.13) PLATFORMS From 2607ac7c36a1678783428ba0a54b8d6f99536069 Mon Sep 17 00:00:00 2001 From: Sam Davies Date: Tue, 12 Mar 2024 12:30:49 +0000 Subject: [PATCH 2/3] WEB-6887: Upgrading octokit --- Gemfile | 2 +- Gemfile.lock | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 63f86cb..9d038fb 100644 --- a/Gemfile +++ b/Gemfile @@ -34,7 +34,7 @@ gem 'aws-sdk-s3', '~> 1.64' gem 'concurrent-ruby', '~> 1.1' # Interacting with github -gem 'octokit', '~> 7' +gem 'octokit', '~> 8' # Interface with libsodium gem 'rbnacl' diff --git a/Gemfile.lock b/Gemfile.lock index 694242b..e75a258 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -126,7 +126,8 @@ GEM notiffany (0.1.3) nenv (~> 0.1) shellany (~> 0.0) - octokit (7.2.0) + octokit (8.1.0) + base64 faraday (>= 1, < 3) sawyer (~> 0.9) parallel (1.24.0) @@ -239,7 +240,7 @@ DEPENDENCIES guard-livereload levenshtein-ffi! mini_magick - octokit (~> 7) + octokit (~> 8) rack-livereload rack-test rbnacl From 6f03afab2a521e8c14a8c0507b1e8a51ad8f3d11 Mon Sep 17 00:00:00 2001 From: Sam Davies Date: Tue, 12 Mar 2024 13:35:44 +0000 Subject: [PATCH 3/3] WEB-6887: Upgrading sinatra --- Gemfile | 5 +++-- Gemfile.lock | 35 +++++++++++++++++++++-------------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/Gemfile b/Gemfile index 9d038fb..71dba71 100644 --- a/Gemfile +++ b/Gemfile @@ -43,8 +43,9 @@ gem 'rbnacl' gem 'slack-notifier', '~> 2.3', '>= 2.3.2' # Local previewing -gem 'sass-embedded', '~> 1.58' -gem 'sinatra', '~> 3' +gem 'rackup' +gem 'sass-embedded' +gem 'sinatra', '~> 4' gem 'thin' # Pinning google-protobuf so that it continues to build on ARM devices diff --git a/Gemfile.lock b/Gemfile.lock index e75a258..6775ad0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -139,14 +139,19 @@ GEM method_source (~> 1.0) public_suffix (5.0.4) racc (1.7.3) - rack (2.2.8.1) - rack-livereload (0.5.2) - rack (< 3) - rack-protection (3.2.0) + rack (3.0.9.1) + rack-livereload (0.5.1) + rack + rack-protection (4.0.0) base64 (>= 0.1.0) - rack (~> 2.2, >= 2.2.4) + rack (>= 3.0.0, < 4) + rack-session (2.0.0) + rack (>= 3.0.0) rack-test (2.1.0) rack (>= 1.3) + rackup (2.1.0) + rack (>= 3) + webrick (~> 1.8) rainbow (3.1.1) rake (13.1.0) rb-fsevent (0.11.2) @@ -182,10 +187,11 @@ GEM addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) shellany (0.0.1) - sinatra (3.2.0) + sinatra (4.0.0) mustermann (~> 3.0) - rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.2.0) + rack (>= 3.0.0, < 4) + rack-protection (= 4.0.0) + rack-session (>= 2.0.0, < 3) tilt (~> 2.0) slack-notifier (2.4.0) solargraph (0.50.0) @@ -204,10 +210,10 @@ GEM thor (~> 1.0) tilt (~> 2.0) yard (~> 0.9, >= 0.9.24) - thin (1.8.2) - daemons (~> 1.0, >= 1.0.9) - eventmachine (~> 1.0, >= 1.0.4) - rack (>= 1, < 3) + thin (1.6.2) + daemons (>= 1.0.9) + eventmachine (>= 1.0.0) + rack (>= 1.0.0) thor (1.3.1) tilt (2.3.0) tzinfo (2.0.6) @@ -243,10 +249,11 @@ DEPENDENCIES octokit (~> 8) rack-livereload rack-test + rackup rbnacl rubocop (~> 1.0) - sass-embedded (~> 1.58) - sinatra (~> 3) + sass-embedded + sinatra (~> 4) slack-notifier (~> 2.3, >= 2.3.2) solargraph (~> 0.39) thin