Merge fb1d901 into f90c900

devise-security · Sep 7, 2020 · 0bed6c0 · 0bed6c0
2 parents f90c900 + fb1d901
commit 0bed6c0
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 17 deletions.
diff --git a/Appraisals b/Appraisals
@@ -1,16 +1,18 @@
 # frozen_string_literal: true
 
-appraise 'rails-4.2' do
-  gem 'rails', '~> 4.2.0'
-  gem 'minitest-rails', '~> 2.0'
-  gem 'bundler', '< 2'
-
-  group :active_record do
-    gem 'sqlite3', '~> 1.3.0'
-  end
-
-  group :mongoid do
-    gem 'mongoid', '~> 4.0'
+if RUBY_VERSION < '2.7'
+  appraise 'rails-4.2' do
+    gem 'rails', '~> 4.2.0'
+    gem 'minitest-rails', '~> 2.0'
+    gem 'bundler', '< 2'
+
+    group :active_record do
+      gem 'sqlite3', '~> 1.3.0'
+    end
+
+    group :mongoid do
+      gem 'mongoid', '~> 4.0'
+    end
   end
 end
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -45,7 +45,7 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    appraisal (2.2.0)
+    appraisal (2.3.0)
       bundler
       rake
       thor (>= 0.14.0)

diff --git a/gemfiles/rails_4.2.gemfile b/gemfiles/rails_4.2.gemfile
@@ -2,8 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 4.2.0"
 gem "minitest-rails", "~> 2.0"
+gem "rails", "~> 4.2.0"
 gem "bundler", "< 2"
 
 group :active_record do

diff --git a/gemfiles/rails_5.0.gemfile b/gemfiles/rails_5.0.gemfile
@@ -2,8 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.0.0"
 gem "minitest-rails", "~> 5.0.0"
+gem "rails", "~> 5.0.0"
 
 group :active_record do
   gem "sqlite3", "~> 1.3.0"

diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile
@@ -2,8 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.1.0"
 gem "minitest-rails", "~> 5.1.0"
+gem "rails", "~> 5.1.0"
 
 group :active_record do
   gem "sqlite3", "~> 1.3.0"

diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile
@@ -2,8 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.2.0"
 gem "minitest-rails", "~> 5.2.0"
+gem "rails", "~> 5.2.0"
 
 group :active_record do
   gem "sqlite3", "~> 1.3.0"

diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile
@@ -2,8 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 6.0.0"
 gem "minitest-rails", "~> 6.0.0"
+gem "rails", "~> 6.0.0"
 
 group :active_record do
   gem "sqlite3"