From b3798c835b7857a148e98644ed755a94e99ea250 Mon Sep 17 00:00:00 2001
From: Nina Siessegger <n.siessegger@zeromail.org>
Date: Sun, 11 Sep 2022 17:05:42 +0200
Subject: [PATCH] Add dependency on net-http gem
With ruby 3 net-http has been promoted to default gems. Adding it as a
dependency fixes 'already initialized constant errors' if net-imap or
some other gem is included.
---
Gemfile | 5 ++++-
Gemfile.lock | 5 +++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/Gemfile b/Gemfile
index 96a206b..848e43e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,12 +10,15 @@ gem 'bootstrap-sass', '~> 3.3'
gem 'simple_form', '~> 5.0.0'
gem 'squire', '~> 1.3'
gem 'cancancan', '~> 3.2.0'
-
gem 'sqlite3', '~> 1.4.0'
gem 'thin'
gem "activeresource-response"
gem "secure_headers", "~> 6.3"
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3')
+ gem 'net-http', require: false
+end
+
group :development do
gem 'spring'
gem 'byebug'
diff --git a/Gemfile.lock b/Gemfile.lock
index ae347ec..576c764 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -154,6 +154,9 @@ GEM
msgpack (1.5.6)
mustermann (2.0.2)
ruby2_keywords (~> 0.0.1)
+ net-http (0.2.0)
+ net-protocol
+ uri
net-imap (0.2.3)
digest
net-protocol
@@ -278,6 +281,7 @@ GEM
timeout (0.3.0)
tzinfo (2.0.5)
concurrent-ruby (~> 1.0)
+ uri (0.11.0)
webmock (3.18.1)
addressable (>= 2.8.0)
crack (>= 0.3.2)
@@ -305,6 +309,7 @@ DEPENDENCIES
irb
launchy
listen
+ net-http
rails (~> 7.0, >= 6.1.2.1)
rake
rspec-rails
--
GitLab