Merge 0cc715d into 6e60d27

refinery · Oct 1, 2019 · 84ec02b · 84ec02b
2 parents 6e60d27 + 0cc715d
commit 84ec02b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -0,0 +1 @@
+2.4.5
diff --git a/core/lib/refinery/version.rb b/core/lib/refinery/version.rb
@@ -1,8 +1,8 @@
 module Refinery
   class Version
     @major = 4
-    @minor = 0
-    @tiny  = 2
+    @minor = 1
+    @tiny  = 0
     @build = nil
 
     class << self

diff --git a/core/refinerycms-core.gemspec b/core/refinerycms-core.gemspec
@@ -2,7 +2,7 @@
 require File.expand_path('../../core/lib/refinery/version', __FILE__)
 
 version = Refinery::Version.to_s
-rails_version = ['>= 5.2.0', '< 6']
+rails_version = ['>= 5.2.0', '< 7']
 
 Gem::Specification.new do |s|
   s.platform          = Gem::Platform::RUBY
@@ -22,13 +22,13 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = Refinery::Version.required_ruby_version
 
-  s.add_dependency 'refinerycms-i18n',            ['~> 5.0', '>= 5.0.0']
+  s.add_dependency 'refinerycms-i18n',            ['~> 5.0', '>= 5.0.1']
   s.add_dependency 'railties',                    rails_version
   s.add_dependency 'activerecord',                rails_version
   s.add_dependency 'actionpack',                  rails_version
   s.add_dependency 'truncate_html',               '~> 0.9'
   s.add_dependency 'will_paginate',               '~> 3.1', '>= 3.1.0'
-  s.add_dependency 'sass-rails',                  '>= 4.0', '< 5.1'
+  s.add_dependency 'sass-rails',                  '>= 4.0', '< 7'
   s.add_dependency 'font-awesome-sass',           '>= 4.3.0', '< 5.0'
   s.add_dependency 'coffee-rails',                ['~> 4.0', '>= 4.0.0']
   s.add_dependency 'jquery-rails',                '~> 4.3', '>= 4.3.1'

diff --git a/testing/refinerycms-testing.gemspec b/testing/refinerycms-testing.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.files             = `git ls-files`.split("\n")
 
   s.add_dependency 'refinerycms-core',        version
-  s.add_dependency 'database_cleaner',        '~> 1.6'
+  s.add_dependency 'database_cleaner',        '>= 1.6'
   s.add_dependency 'factory_bot_rails',       '~> 4.8'
   s.add_dependency 'rspec-rails',             '~> 3.5'
   s.add_dependency 'capybara',                '>= 2.18'