115 lines
2.6 KiB
Diff
115 lines
2.6 KiB
Diff
|
From 0ddbfb1fe1de4052ee0c64e4c4c05669254a66c6 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Antoine Martin <dev@ayakael.net>
|
||
|
|
Date: Wed, 27 Jul 2022 10:31:02 -0400
|
||
|
|
Subject: [PATCH 1/1] ruby-3.1-support
|
||
|
|
|
||
|
|
---
|
||
|
|
Gemfile | 3 ++-
|
||
|
|
Gemfile.lock | 29 ++++++++++++++++++++++++++++-
|
||
|
|
2 files changed, 30 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/Gemfile b/Gemfile
|
||
|
|
index 2e77fb42a..2fb22a217 100644
|
||
|
|
--- a/Gemfile
|
||
|
|
+++ b/Gemfile
|
||
|
|
@@ -1,7 +1,7 @@
|
||
|
|
# frozen_string_literal: true
|
||
|
|
|
||
|
|
source 'https://rubygems.org'
|
||
|
|
-ruby '>= 2.6.0', '< 3.1.0'
|
||
|
|
+ruby '>= 2.6.0', '< 3.2.0'
|
||
|
|
|
||
|
|
gem 'pkg-config', '~> 1.4'
|
||
|
|
gem 'rexml', '~> 3.2'
|
||
|
|
@@ -153,3 +153,4 @@ gem 'concurrent-ruby', require: false
|
||
|
|
gem 'connection_pool', require: false
|
||
|
|
|
||
|
|
gem 'xorcist', '~> 1.1'
|
||
|
|
+gem 'mail', '~> 2.8.0.rc1'
|
||
|
|
diff --git a/Gemfile.lock b/Gemfile.lock
|
||
|
|
index e12fdc237..a3c6298f7 100644
|
||
|
|
--- a/Gemfile.lock
|
||
|
|
+++ b/Gemfile.lock
|
||
|
|
@@ -192,6 +192,7 @@ GEM
|
||
|
|
devise (>= 4.0.0)
|
||
|
|
rpam2 (~> 4.0)
|
||
|
|
diff-lcs (1.5.0)
|
||
|
|
+ digest (3.1.0)
|
||
|
|
discard (1.2.1)
|
||
|
|
activerecord (>= 4.2, < 8)
|
||
|
|
docile (1.3.4)
|
||
|
|
@@ -377,8 +378,11 @@ GEM
|
||
|
|
loofah (2.18.0)
|
||
|
|
crass (~> 1.0.2)
|
||
|
|
nokogiri (>= 1.5.9)
|
||
|
|
- mail (2.7.1)
|
||
|
|
+ mail (2.8.0.rc1)
|
||
|
|
mini_mime (>= 0.1.1)
|
||
|
|
+ net-imap
|
||
|
|
+ net-pop
|
||
|
|
+ net-smtp
|
||
|
|
makara (0.5.1)
|
||
|
|
activerecord (>= 5.2.0)
|
||
|
|
marcel (1.0.2)
|
||
|
|
@@ -399,9 +403,23 @@ GEM
|
||
|
|
msgpack (1.5.1)
|
||
|
|
multi_json (1.15.0)
|
||
|
|
multipart-post (2.1.1)
|
||
|
|
+ net-imap (0.2.3)
|
||
|
|
+ digest
|
||
|
|
+ net-protocol
|
||
|
|
+ strscan
|
||
|
|
net-ldap (0.17.0)
|
||
|
|
+ net-pop (0.1.1)
|
||
|
|
+ digest
|
||
|
|
+ net-protocol
|
||
|
|
+ timeout
|
||
|
|
+ net-protocol (0.1.3)
|
||
|
|
+ timeout
|
||
|
|
net-scp (3.0.0)
|
||
|
|
net-ssh (>= 2.6.5, < 7.0.0)
|
||
|
|
+ net-smtp (0.3.1)
|
||
|
|
+ digest
|
||
|
|
+ net-protocol
|
||
|
|
+ timeout
|
||
|
|
net-ssh (6.1.0)
|
||
|
|
nio4r (2.5.8)
|
||
|
|
nokogiri (1.13.6)
|
||
|
|
@@ -643,6 +661,7 @@ GEM
|
||
|
|
stoplight (3.0.0)
|
||
|
|
strong_migrations (0.7.9)
|
||
|
|
activerecord (>= 5)
|
||
|
|
+ strscan (3.0.4)
|
||
|
|
swd (1.3.0)
|
||
|
|
activesupport (>= 3)
|
||
|
|
attr_required (>= 0.0.5)
|
||
|
|
@@ -654,6 +673,7 @@ GEM
|
||
|
|
climate_control (>= 0.0.3, < 1.0)
|
||
|
|
thor (1.2.1)
|
||
|
|
tilt (2.0.10)
|
||
|
|
+ timeout (0.3.0)
|
||
|
|
tpm-key_attestation (0.9.0)
|
||
|
|
bindata (~> 2.4)
|
||
|
|
openssl-signature_algorithm (~> 0.4.0)
|
||
|
|
@@ -780,6 +800,7 @@ DEPENDENCIES
|
||
|
|
letter_opener_web (~> 2.0)
|
||
|
|
link_header (~> 0.0)
|
||
|
|
lograge (~> 0.12)
|
||
|
|
+ mail (~> 2.8.0.rc1)
|
||
|
|
makara (~> 0.5)
|
||
|
|
mario-redis-lock (~> 1.2)
|
||
|
|
memory_profiler
|
||
|
|
@@ -846,3 +867,9 @@ DEPENDENCIES
|
||
|
|
webpacker (~> 5.4)
|
||
|
|
webpush (~> 0.3)
|
||
|
|
xorcist (~> 1.1)
|
||
|
|
+
|
||
|
|
+RUBY VERSION
|
||
|
|
+ ruby 3.1.2p20
|
||
|
|
+
|
||
|
|
+BUNDLED WITH
|
||
|
|
+ 2.3.14
|
||
|
|
--
|
||
|
|
2.36.2
|
||
|
|
|