Merge pull request #51 from brchristian/rails5-1

Support Rails 5.1.x
solidusio · Oct 5, 2020 · 1011d52 · 1011d52
2 parents 1f2b80b + b1d6497
commit 1011d52
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/solidus_support.gemspec b/solidus_support.gemspec
@@ -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'

diff --git a/spec/support/dummy_app.rb b/spec/support/dummy_app.rb
@@ -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