Skip to content

Commit

Permalink
Merge pull request #2073 from DataDog/fix/rails-six-integration-app-gems
Browse files Browse the repository at this point in the history
Fix rails-six integration app gems with Ruby 2.5
  • Loading branch information
delner authored Jun 9, 2022
2 parents 56195f5 + 4a01ba0 commit 0646d7d
Showing 1 changed file with 15 additions and 4 deletions.
19 changes: 15 additions & 4 deletions integration/apps/rails-six/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,15 @@ source 'https://rubygems.org' do
gem 'multi_json'
gem 'oj', platform: :ruby

# Need to add these because ActionMailer is broken in 6.1.5
# Need to add these because ActionMailer is broken in 6.1.6
# https://github.com/rails/rails/pull/44697
gem 'net-smtp'
gem 'net-imap'
if RUBY_VERSION < '2.6.0'
gem 'net-smtp', '0.3.0'
gem 'net-imap', '0.2.2'
else
gem 'net-smtp'
gem 'net-imap'
end
gem 'net-pop'

gem 'active_model_serializers'
Expand Down Expand Up @@ -80,7 +85,13 @@ source 'https://rubygems.org' do
gem 'rspec'
gem 'rspec-collection_matchers'
gem 'rspec-rails'
gem 'shoulda-matchers'

if RUBY_VERSION < '2.6.0'
gem 'shoulda-matchers', '~> 4.5'
else
gem 'shoulda-matchers'
end

gem 'simplecov', require: false # Will install simplecov-html as a dependency
gem 'timecop'
gem 'webmock'
Expand Down

0 comments on commit 0646d7d

Please sign in to comment.