Fix some ruby 3.1 incompatibilities

- Updates thor to DidYouMean::SPELL_CHECKERS warning - Explicitely bundles mail depencencies - Allow aliases in YAML.load_file
openSUSE · Mar 15, 2022 · 2d7b93b · 2d7b93b
1 parent ae908b4
commit 2d7b93b
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 2 deletions.
diff --git a/src/api/Gemfile b/src/api/Gemfile
@@ -93,6 +93,12 @@ gem 'gitlab'
 # Build reusable, testable & encapsulated view components in Ruby on Rails
 gem 'view_component'
 
+# FIXME: Required by the mail gem
+# See https://github.com/rails/rails/pull/44083
+gem 'net-smtp', require: false
+gem 'net-pop', require: false
+gem 'net-imap', require: false
+
 group :development, :production do
   # to have the delayed job daemon
   gem 'daemons'

diff --git a/src/api/Gemfile.lock b/src/api/Gemfile.lock
@@ -148,6 +148,7 @@ GEM
       activerecord (>= 3.0, < 8.0)
       delayed_job (>= 3.0, < 5)
     diff-lcs (1.5.0)
+    digest (3.1.0)
     docile (1.4.0)
     down (5.3.0)
       addressable (~> 2.8)
@@ -237,6 +238,7 @@ GEM
       influxdb (~> 0.6, >= 0.6.4)
       railties (>= 5.0)
     innertube (1.1.0)
+    io-wait (0.2.1)
     joiner (0.6.0)
       activerecord (>= 6.1.0)
     jquery-datatables (1.10.20)
@@ -293,6 +295,21 @@ GEM
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     mysql2 (0.5.3)
+    net-imap (0.2.3)
+      digest
+      net-protocol
+      strscan
+    net-pop (0.1.1)
+      digest
+      net-protocol
+      timeout
+    net-protocol (0.1.2)
+      io-wait
+      timeout
+    net-smtp (0.3.1)
+      digest
+      net-protocol
+      timeout
     next_rails (1.0.4)
       colorize (>= 0.8.1)
     nio4r (2.5.8)
@@ -458,6 +475,7 @@ GEM
       sprockets (>= 3.0.0)
     strong_migrations (0.7.9)
       activerecord (>= 5)
+    strscan (3.0.1)
     sync (0.5.0)
     sysexits (1.2.0)
     temple (0.8.2)
@@ -474,9 +492,10 @@ GEM
       joiner (>= 0.3.4)
       middleware (>= 0.1.0)
       riddle (~> 2.3)
-    thor (1.1.0)
+    thor (1.2.1)
     tilt (2.0.10)
     timecop (0.9.5)
+    timeout (0.2.0)
     tins (1.31.0)
       sync
     tzinfo (2.0.4)
@@ -567,6 +586,9 @@ DEPENDENCIES
   minitest-reporters
   mocha
   mysql2
+  net-imap
+  net-pop
+  net-smtp
   next_rails
   nokogiri
   octokit

diff --git a/src/api/config/environment.rb b/src/api/config/environment.rb
@@ -6,7 +6,7 @@
 path = Rails.root.join('config', 'options.yml')
 
 begin
-  config = YAML.load_file(path)
+  config = YAML.load_file(path, aliases: true)
   if config.key?(Rails.env)
     CONFIG = config[Rails.env]
   else

diff --git a/src/api/vendor/cache/digest-3.1.0.gem b/src/api/vendor/cache/digest-3.1.0.gem
diff --git a/src/api/vendor/cache/io-wait-0.2.1.gem b/src/api/vendor/cache/io-wait-0.2.1.gem
diff --git a/src/api/vendor/cache/net-imap-0.2.3.gem b/src/api/vendor/cache/net-imap-0.2.3.gem
diff --git a/src/api/vendor/cache/net-pop-0.1.1.gem b/src/api/vendor/cache/net-pop-0.1.1.gem
diff --git a/src/api/vendor/cache/net-protocol-0.1.2.gem b/src/api/vendor/cache/net-protocol-0.1.2.gem
diff --git a/src/api/vendor/cache/net-smtp-0.3.1.gem b/src/api/vendor/cache/net-smtp-0.3.1.gem
diff --git a/src/api/vendor/cache/strscan-3.0.1.gem b/src/api/vendor/cache/strscan-3.0.1.gem
diff --git a/src/api/vendor/cache/thor-1.2.1.gem b/src/api/vendor/cache/thor-1.2.1.gem
diff --git a/src/api/vendor/cache/timeout-0.2.0.gem b/src/api/vendor/cache/timeout-0.2.0.gem