Skip to content

Commit

Permalink
Merge f23f8eb into e92c13b
Browse files Browse the repository at this point in the history
  • Loading branch information
sliiser committed Nov 12, 2019
2 parents e92c13b + f23f8eb commit 8262515
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 17 deletions.
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ matrix:
gemfile: gemfiles/rails_6.0.gemfile
- rvm: 2.4.5
gemfile: gemfiles/rails_6.0.gemfile
- rvm: ruby-head
gemfile: gemfiles/rails_5.0.gemfile
- rvm: ruby-head
gemfile: gemfiles/rails_5.1.gemfile
- rvm: ruby-head
gemfile: gemfiles/rails_5.2.gemfile
script:
- bundle exec rake rubocop
- bundle exec rspec
2 changes: 1 addition & 1 deletion gemfiles/rails_5.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

source 'https://rubygems.org'

gem 'rails', '~> 5.0.7.1'
gem 'railties', '~> 5.0.7.1'
gem 'sqlite3', '~> 1.3.6'

gemspec path: '../'
2 changes: 1 addition & 1 deletion gemfiles/rails_5.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

source 'https://rubygems.org'

gem 'rails', '~> 5.1.6.1'
gem 'railties', '~> 5.1.6.1'
gem 'sqlite3', '~> 1.3.6'

gemspec path: '../'
2 changes: 1 addition & 1 deletion gemfiles/rails_5.2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@

source 'https://rubygems.org'

gem 'rails', '~> 5.2.2'
gem 'railties', '~> 5.2.2'

gemspec path: '../'
2 changes: 1 addition & 1 deletion gemfiles/rails_6.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@

source 'https://rubygems.org'

gem 'rails', '~> 6.0.0'
gem 'railties', '~> 6.0.0'

gemspec path: '../'
2 changes: 1 addition & 1 deletion health-monitor-rails.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Gem::Specification.new do |s|
s.files = Dir['{app,config,db,lib}/**/*', 'MIT-LICENSE', 'Rakefile', 'README.md']
s.test_files = Dir['test/**/*']

s.add_dependency 'rails', '>= 4.0'
s.add_dependency 'railties', '>= 4.0'

s.add_development_dependency 'appraisal'
s.add_development_dependency 'capybara'
Expand Down
3 changes: 0 additions & 3 deletions spec/dummy/config/environments/development.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@
config.consider_all_requests_local = true
config.action_controller.perform_caching = false

# Don't care if the mailer can't send.
config.action_mailer.raise_delivery_errors = false

# Print deprecation notices to the Rails logger.
config.active_support.deprecation = :log

Expand Down
4 changes: 0 additions & 4 deletions spec/dummy/config/environments/production.rb
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,6 @@
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
# config.assets.precompile += %w( search.js )

# Ignore bad email addresses and do not raise email delivery errors.
# Set this to true and configure the email server for immediate delivery to raise delivery errors.
# config.action_mailer.raise_delivery_errors = false

# Enable locale fallbacks for I18n (makes lookups for any locale fall back to
# the I18n.default_locale when a translation can not be found).
config.i18n.fallbacks = true
Expand Down
5 changes: 0 additions & 5 deletions spec/dummy/config/environments/test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,6 @@
# Disable request forgery protection in test environment.
config.action_controller.allow_forgery_protection = false

# Tell Action Mailer not to deliver emails to the real world.
# The :test delivery method accumulates sent emails in the
# ActionMailer::Base.deliveries array.
config.action_mailer.delivery_method = :test

# Print deprecation notices to the stderr.
config.active_support.deprecation = :stderr

Expand Down

0 comments on commit 8262515

Please sign in to comment.