Merge branch 'master' into dependabot/bundler/puma-5.6.8

bigbluebutton · Jan 26, 2024 · fa51240 · fa51240
2 parents a86361f + b36401a
commit fa51240
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Gemfile b/Gemfile
@@ -21,7 +21,7 @@ gem 'hiredis', '~> 0.6.0'
 gem 'i18n-language-mapping'
 gem 'image_processing', '~> 1.2'
 gem 'jbuilder'
-gem 'jsbundling-rails', '>= 1.2.1'
+gem 'jsbundling-rails', '>= 1.2.2'
 gem 'jwt'
 gem 'mini_magick', '>= 4.9.5'
 gem 'omniauth', '~> 2.1.2'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -229,7 +229,7 @@ GEM
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
     jmespath (1.6.2)
-    jsbundling-rails (1.2.1)
+    jsbundling-rails (1.2.2)
       railties (>= 6.0.0)
     json (2.6.3)
     json-jwt (1.16.3)
@@ -367,7 +367,7 @@ GEM
       psych (>= 4.0.0)
     redis (4.8.0)
     regexp_parser (2.8.1)
-    reline (0.4.1)
+    reline (0.4.2)
       io-console (~> 0.5)
     remote_syslog_logger (1.0.4)
       syslog_protocol
@@ -520,7 +520,7 @@ DEPENDENCIES
   i18n-language-mapping
   image_processing (~> 1.2)
   jbuilder
-  jsbundling-rails (>= 1.2.1)
+  jsbundling-rails (>= 1.2.2)
   jwt
   lograge (~> 0.14.0)
   mini_magick (>= 4.9.5)