Skip to content

Commit

Permalink
Merge pull request #51 from brchristian/rails5-1
Browse files Browse the repository at this point in the history
Support Rails 5.1.x
  • Loading branch information
aldesantis committed Oct 5, 2020
2 parents 1f2b80b + b1d6497 commit 1011d52
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 0 additions & 2 deletions solidus_support.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ Gem::Specification.new do |s|
s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
s.require_paths = ["lib"]

s.add_dependency 'activesupport', ['>= 5.2', '< 7.0.x']

s.add_development_dependency 'bundler'
s.add_development_dependency 'rake'
s.add_development_dependency 'rspec-rails'
Expand Down
2 changes: 1 addition & 1 deletion spec/support/dummy_app.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module DummyApp
class Application < ::Rails::Application
config.eager_load = false
config.paths['config/database'] = File.expand_path('dummy_app/database.yml', __dir__)
config.active_record.sqlite3.represent_boolean_as_integer = true
config.active_record.sqlite3.represent_boolean_as_integer = true unless Gem::Version.new(Rails.version) < Gem::Version.new('5.2')
end
end

Expand Down

0 comments on commit 1011d52

Please sign in to comment.