Merge branch 'master' into snyk-fix-5d1b3c5f489825ed2c9971fa9afb2dc9

bigbluebutton · Nov 29, 2023 · cf4a605 · cf4a605
2 parents b415be7 + ecdbf8d
commit cf4a605
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 19 deletions.
diff --git a/Gemfile b/Gemfile
@@ -41,7 +41,7 @@ gem 'redis', '~> 4.2'
 gem 'jwt', '~> 2.2.2'
 gem 'oauth', '~> 0.5.1'
 
-gem 'doorkeeper', '~> 5.6.6'
+gem 'doorkeeper', '~> 5.6.7'
 gem 'repost', '~> 0.3.8'
 
 gem 'lodash-rails'
@@ -67,7 +67,7 @@ group :development, :test do
   gem 'byebug', platform: :mri
   gem 'dotenv-rails'
   gem 'rspec'
-  gem 'rspec-rails', '>= 6.0.2'
+  gem 'rspec-rails', '>= 6.0.4'
 end
 
 group :development do
@@ -87,7 +87,7 @@ group :test do
 end
 
 group :production do
-  gem 'lograge', '~> 0.13.0'
+  gem 'lograge', '~> 0.14.0'
   gem 'remote_syslog_logger'
 end
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -154,7 +154,7 @@ GEM
     docile (1.4.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    doorkeeper (5.6.6)
+    doorkeeper (5.6.7)
       railties (>= 5)
     dotenv (2.8.1)
     dotenv-rails (2.8.1)
@@ -236,12 +236,12 @@ GEM
       rake (~> 13.0)
     lodash-rails (4.17.21)
       railties (>= 3.1)
-    lograge (0.13.0)
+    lograge (0.14.0)
       actionpack (>= 4)
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.21.3)
+    loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -251,7 +251,7 @@ GEM
       net-smtp
     marcel (1.0.2)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.4)
+    mini_portile2 (2.8.5)
     minitest (5.20.0)
     minitest-stub_any_instance (1.0.3)
     multi_json (1.15.0)
@@ -267,10 +267,10 @@ GEM
     net-smtp (0.4.0)
       net-protocol
     nio4r (2.5.9)
-    nokogiri (1.15.4)
+    nokogiri (1.15.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.15.4-x86_64-linux)
+    nokogiri (1.15.5-x86_64-linux)
       racc (~> 1.4)
     oauth (0.5.14)
     oauthenticator (1.4.1)
@@ -289,7 +289,7 @@ GEM
     public_suffix (5.0.3)
     puma (6.3.1)
       nio4r (~> 2.0)
-    racc (1.7.1)
+    racc (1.7.3)
     rack (3.0.8)
     rack-session (2.0.0)
       rack (>= 3.0.0)
@@ -328,7 +328,7 @@ GEM
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.0.6)
+    rake (13.1.0)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -362,7 +362,7 @@ GEM
     rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-rails (6.0.3)
+    rspec-rails (6.1.0)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
@@ -424,7 +424,7 @@ GEM
       tins (~> 1.0)
     terser (1.1.17)
       execjs (>= 0.3.0, < 3)
-    thor (1.2.2)
+    thor (1.3.0)
     tilt (2.3.0)
     timeout (0.4.0)
     tins (1.32.1)
@@ -467,7 +467,7 @@ DEPENDENCIES
   byebug
   coffee-rails (~> 5.0, >= 5.0.0)
   coveralls
-  doorkeeper (~> 5.6.6)
+  doorkeeper (~> 5.6.7)
   dotenv-rails
   faraday
   font-awesome-sass (~> 6.4.0)
@@ -478,7 +478,7 @@ DEPENDENCIES
   jwt (~> 2.2.2)
   listen (~> 3.0.5)
   lodash-rails
-  lograge (~> 0.13.0)
+  lograge (~> 0.14.0)
   minitest-stub_any_instance
   oauth (~> 0.5.1)
   oauthenticator (~> 1.4, >= 1.4.1)
@@ -492,7 +492,7 @@ DEPENDENCIES
   remote_syslog_logger
   repost (~> 0.3.8)
   rspec
-  rspec-rails (>= 6.0.2)
+  rspec-rails (>= 6.0.4)
   rubocop (~> 1.54)
   rubocop-rails (~> 2.21, >= 2.21.0)
   sass-rails (>= 6.0.0)
@@ -504,6 +504,3 @@ DEPENDENCIES
   tzinfo-data
   web-console (>= 4.2.1)
   webmock
-
-BUNDLED WITH
-   2.1.4