mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Merge pull request #42366 from yahonda/net_smtp_willbe_bundled_gem_in_ruby31
Add `net/smtp` gem for bug report templates to support Ruby 3.1
This commit is contained in:
commit
2fd78b126c
2 changed files with 10 additions and 0 deletions
|
@ -10,6 +10,11 @@ gemfile(true) do
|
||||||
# Activate the gem you are reporting the issue against.
|
# Activate the gem you are reporting the issue against.
|
||||||
gem "rails", "6.1.0"
|
gem "rails", "6.1.0"
|
||||||
gem "sqlite3"
|
gem "sqlite3"
|
||||||
|
if RUBY_VERSION >= "3.1"
|
||||||
|
# net-smtp, net-imap and net-pop were removed from default gems in Ruby 3.1, but is used by the `mail` gem.
|
||||||
|
# So we need to add them as dependencies until `mail` is fixed: https://github.com/mikel/mail/pull/1439
|
||||||
|
gem "net-smtp", require: false
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
require "active_record/railtie"
|
require "active_record/railtie"
|
||||||
|
|
|
@ -9,6 +9,11 @@ gemfile(true) do
|
||||||
|
|
||||||
gem "rails", github: "rails/rails", branch: "main"
|
gem "rails", github: "rails/rails", branch: "main"
|
||||||
gem "sqlite3"
|
gem "sqlite3"
|
||||||
|
if RUBY_VERSION >= "3.1"
|
||||||
|
# net-smtp, net-imap and net-pop were removed from default gems in Ruby 3.1, but is used by the `mail` gem.
|
||||||
|
# So we need to add them as dependencies until `mail` is fixed: https://github.com/mikel/mail/pull/1439
|
||||||
|
gem "net-smtp", require: false
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
require "active_record/railtie"
|
require "active_record/railtie"
|
||||||
|
|
Loading…
Reference in a new issue