From 742bcc846d112f7a6d04c38c467f70335700965f Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Thu, 11 Jan 2024 08:54:27 +0000
Subject: [PATCH 1/2] fix: Gemfile & Gemfile.lock to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-RUBY-PUMA-6146928
---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3b051a95..a6662ef7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,7 +8,7 @@ gem 'rails', '~> 7.1.1'
 # Use sqlite3 as the database for Active Record
 gem 'sqlite3', '~> 1.4'
 # Use Puma as the app server
-gem 'puma', '~> 5.6', '>= 5.6.7'
+gem 'puma', '~> 5.6', '>= 5.6.8'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 # gem 'jbuilder', '~> 2.7'
 # Use Redis adapter to run Action Cable in production
diff --git a/Gemfile.lock b/Gemfile.lock
index fdaceeb4..1ebff296 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -221,7 +221,7 @@ GEM
       timeout
     net-smtp (0.4.0)
       net-protocol
-    nio4r (2.6.1)
+    nio4r (2.7.0)
     nokogiri (1.15.5-x86_64-darwin)
       racc (~> 1.4)
     nokogiri (1.15.5-x86_64-linux)
@@ -243,7 +243,7 @@ GEM
     psych (5.1.1.1)
       stringio
     public_suffix (5.0.3)
-    puma (5.6.7)
+    puma (5.6.8)
       nio4r (~> 2.0)
     racc (1.7.3)
     rack (2.2.8)
@@ -427,7 +427,7 @@ DEPENDENCIES
   olive_branch (>= 4.0.1)
   pg
   pry-rails
-  puma (~> 5.6, >= 5.6.7)
+  puma (~> 5.6, >= 5.6.8)
   rack-cors
   rails (~> 7.1.1)
   redis

From 222c5a0b4e50a99dd7683b40a3d9cd0c37de343b Mon Sep 17 00:00:00 2001
From: mohammed Aziz <mo_zag@yahoo.co.uk>
Date: Mon, 18 Mar 2024 12:51:20 +0000
Subject: [PATCH 2/2] Update Gemfile.lock

---
 Gemfile.lock | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index eaf06eac..eb93ce3d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,11 @@
+GIT
+  remote: https://github.com/sparklemotion/sqlite3-ruby.git
+  revision: 77e902d5d717cdcb092247accd53388f09cdea9d
+  tag: v1.6.5
+  specs:
+    sqlite3 (1.6.5)
+      mini_portile2 (~> 2.8.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -207,6 +215,7 @@ GEM
     marcel (1.0.2)
     method_source (1.0.0)
     mini_mime (1.1.5)
+    mini_portile2 (2.8.5)
     minitest (5.20.0)
     msgpack (1.7.2)
     multi_json (1.15.0)
@@ -384,8 +393,6 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     smart_properties (1.17.0)
-    sqlite3 (1.6.5-x86_64-darwin)
-    sqlite3 (1.6.5-x86_64-linux)
     stringio (3.1.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
@@ -393,6 +400,8 @@ GEM
     timeout (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
+    tzinfo-data (1.2024.1)
+      tzinfo (>= 1.0.0)
     unicode-display_width (2.5.0)
     webmock (3.19.1)
       addressable (>= 2.8.0)
@@ -440,7 +449,8 @@ DEPENDENCIES
   rubocop-rails (>= 2.21.1)
   rubocop-rspec (>= 2.2.0)
   simplecov
-  sqlite3 (~> 1.4)
+  sqlite3 (~> 1.6)!
+  tzinfo-data
   webmock (>= 3.12.1)
 
 RUBY VERSION