Skip to content

Commit

Permalink
Fix: Workaround for Rails 6 + Ruby 3.1 bug (#398)
Browse files Browse the repository at this point in the history
  • Loading branch information
pglombardo committed Aug 29, 2022
1 parent cd11015 commit fb806e7
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 2 deletions.
7 changes: 6 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,15 @@ gem 'config'
gem 'route_translator', '>= 12.1.0'
gem 'translation'
gem 'mail_form', '>= 1.9.0'
gem 'net-smtp'
gem 'apipie-rails'
gem 'simple_token_authentication', '~> 1.0'

# Fix for https://github.com/pglombardo/PasswordPusher/issues/397
# In place until Rails 7.0.1 upgrade
gem 'net-smtp', require: false
gem 'net-imap', require: false
gem 'net-pop', require: false

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

Expand Down
11 changes: 11 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,14 @@ GEM
minitest (>= 5.0)
ruby-progressbar
msgpack (1.5.6)
net-imap (0.2.3)
digest
net-protocol
strscan
net-pop (0.1.1)
digest
net-protocol
timeout
net-protocol (0.1.3)
timeout
net-smtp (0.3.1)
Expand Down Expand Up @@ -333,6 +341,7 @@ GEM
activesupport (>= 5.2)
sprockets (>= 3.0.0)
sqlite3 (1.4.4)
strscan (3.0.4)
text (1.3.1)
thor (1.2.1)
tilt (2.0.11)
Expand Down Expand Up @@ -395,6 +404,8 @@ DEPENDENCIES
minitest
minitest-rails (>= 6.1.0)
minitest-reporters
net-imap
net-pop
net-smtp
oj
pg
Expand Down
7 changes: 6 additions & 1 deletion gemfiles/Gemfile-mysql
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,15 @@ gem 'config'
gem 'route_translator'
gem 'translation'
gem 'mail_form'
gem 'net-smtp'
gem 'apipie-rails'
gem 'simple_token_authentication', '~> 1.0'

# Fix for https://github.com/pglombardo/PasswordPusher/issues/397
# In place until Rails 7.0.1 upgrade
gem 'net-smtp', require: false
gem 'net-imap', require: false
gem 'net-pop', require: false

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

Expand Down
11 changes: 11 additions & 0 deletions gemfiles/Gemfile-mysql.lock
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,14 @@ GEM
ruby-progressbar
msgpack (1.5.6)
mysql2 (0.5.4)
net-imap (0.2.3)
digest
net-protocol
strscan
net-pop (0.1.1)
digest
net-protocol
timeout
net-protocol (0.1.3)
timeout
net-smtp (0.3.1)
Expand Down Expand Up @@ -333,6 +341,7 @@ GEM
activesupport (>= 5.2)
sprockets (>= 3.0.0)
sqlite3 (1.4.4)
strscan (3.0.4)
text (1.3.1)
thor (1.2.1)
tilt (2.0.11)
Expand Down Expand Up @@ -396,6 +405,8 @@ DEPENDENCIES
minitest-rails
minitest-reporters
mysql2
net-imap
net-pop
net-smtp
oj
pry-byebug
Expand Down

0 comments on commit fb806e7

Please sign in to comment.