Merge remote-tracking branch 'bbb/master' into merge-upstream-changes

mconf · Jan 25, 2024 · c31e831 · c31e831
2 parents f7202e0 + 3a74bfa
commit c31e831
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Gemfile b/Gemfile
@@ -45,7 +45,7 @@ gem 'doorkeeper', '~> 5.6.8'
 gem 'repost', '~> 0.3.8'
 
 gem 'lodash-rails'
-gem 'react-rails', '>= 3.0.0'
+gem 'react-rails', '>= 3.2.0'
 
 # gem 'rails_lti2_provider', git: 'https://github.com/mconf/rails_lti2_provider.git', branch: 'elos'
 gem 'rails_lti2_provider', git: 'https://github.com/blindsidenetworks/rails_lti2_provider.git', tag: '0.1.5'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -155,7 +155,7 @@ GEM
     erubi (1.12.0)
     et-orbi (1.2.7)
       tzinfo
-    execjs (2.8.1)
+    execjs (2.9.1)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -340,7 +340,7 @@ GEM
       ffi (~> 1.0)
     rdoc (6.5.0)
       psych (>= 4.0.0)
-    react-rails (3.1.1)
+    react-rails (3.2.0)
       babel-transpiler (>= 0.7.0)
       connection_pool
       execjs
@@ -453,7 +453,7 @@ GEM
     terser (1.1.17)
       execjs (>= 0.3.0, < 3)
     thor (1.3.0)
-    tilt (2.2.0)
+    tilt (2.3.0)
     timeout (0.4.0)
     tins (1.32.1)
       sync
@@ -522,7 +522,7 @@ DEPENDENCIES
   rails_admin (~> 3.0)
   rails_lti2_provider!
   rdoc
-  react-rails (>= 3.0.0)
+  react-rails (>= 3.2.0)
   redis (~> 4.2)
   remote_syslog_logger
   repost (~> 0.3.8)