From 067ca78e2ddd2d80cf08f3516d1375a46e3272de Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Dec 2022 00:54:58 +0000 Subject: [PATCH] Bump sinatra, sprockets and sinatra-contrib in /web Bumps [sinatra](https://github.com/sinatra/sinatra), [sprockets](https://github.com/rails/sprockets) and [sinatra-contrib](https://github.com/sinatra/sinatra). These dependencies needed to be updated together. Updates `sinatra` from 1.4.8 to 3.0.4 - [Release notes](https://github.com/sinatra/sinatra/releases) - [Changelog](https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/v1.4.8...v3.0.4) Updates `sprockets` from 2.12.5 to 4.1.1 - [Release notes](https://github.com/rails/sprockets/releases) - [Changelog](https://github.com/rails/sprockets/blob/main/CHANGELOG.md) - [Commits](https://github.com/rails/sprockets/compare/v2.12.5...v4.1.1) Updates `sinatra-contrib` from 1.4.7 to 3.0.4 - [Release notes](https://github.com/sinatra/sinatra/releases) - [Changelog](https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/v1.4.7...v3.0.4) --- updated-dependencies: - dependency-name: sinatra dependency-type: direct:production - dependency-name: sprockets dependency-type: direct:production - dependency-name: sinatra-contrib dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- web/Gemfile | 6 +++--- web/Gemfile.lock | 50 +++++++++++++++++++++++------------------------- 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/web/Gemfile b/web/Gemfile index 7b3be00..5859292 100644 --- a/web/Gemfile +++ b/web/Gemfile @@ -3,12 +3,12 @@ source "https://rubygems.org" gem 'eventmachine', '~> 1.0.9.1' # framework -gem 'sinatra', '~> 1.4' +gem 'sinatra', '~> 3.0' gem 'sinatra-extension', '~> 1.0' -gem 'sinatra-contrib', '~> 1.4' +gem 'sinatra-contrib', '~> 3.0' # view -gem 'sprockets', '~> 2.12' +gem 'sprockets', '~> 4.1' gem 'coffee-script', '~> 2.2.0' gem 'haml', '~> 3.1.4' gem 'sass', '~> 3.2.3' diff --git a/web/Gemfile.lock b/web/Gemfile.lock index 59e2d69..40b74ff 100644 --- a/web/Gemfile.lock +++ b/web/Gemfile.lock @@ -1,7 +1,6 @@ GEM remote: https://rubygems.org/ specs: - backports (3.11.4) better_errors (0.9.0) coderay (>= 1.0.0) erubis (>= 2.6.6) @@ -13,48 +12,47 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) + concurrent-ruby (1.1.10) debug_inspector (0.0.3) erubis (2.7.0) eventmachine (1.0.9.1) execjs (2.7.0) haml (3.1.8) - hike (1.2.3) libv8 (3.16.14.19) macaddr (1.6.1) systemu (~> 2.5.0) - multi_json (1.13.1) - rack (1.6.11) - rack-protection (1.5.5) + multi_json (1.15.0) + mustermann (3.0.0) + ruby2_keywords (~> 0.0.1) + rack (2.2.4) + rack-protection (3.0.4) rack - rack-test (1.1.0) - rack (>= 1.0, < 3) ref (2.0.0) + ruby2_keywords (0.0.5) sass (3.2.19) shotgun (0.9.2) rack (>= 1.0) - sinatra (1.4.8) - rack (~> 1.5) - rack-protection (~> 1.4) - tilt (>= 1.3, < 3) - sinatra-contrib (1.4.7) - backports (>= 2.0) + sinatra (3.0.4) + mustermann (~> 3.0) + rack (~> 2.2, >= 2.2.4) + rack-protection (= 3.0.4) + tilt (~> 2.0) + sinatra-contrib (3.0.4) multi_json - rack-protection - rack-test - sinatra (~> 1.4.0) - tilt (>= 1.3, < 3) + mustermann (~> 3.0) + rack-protection (= 3.0.4) + sinatra (= 3.0.4) + tilt (~> 2.0) sinatra-extension (1.0) sinatra-contrib - sprockets (2.12.5) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) + sprockets (4.1.1) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) systemu (2.5.2) therubyracer (0.12.3) libv8 (~> 3.16.14.15) ref - tilt (1.4.1) + tilt (2.0.11) uuid (2.3.9) macaddr (~> 1.0) @@ -70,10 +68,10 @@ DEPENDENCIES haml (~> 3.1.4) sass (~> 3.2.3) shotgun (~> 0.9) - sinatra (~> 1.4) - sinatra-contrib (~> 1.4) + sinatra (~> 3.0) + sinatra-contrib (~> 3.0) sinatra-extension (~> 1.0) - sprockets (~> 2.12) + sprockets (~> 4.1) systemu (~> 2.5.2) therubyracer (~> 0.12.0) uuid (~> 2.3.7)