Skip to content

Commit 03baf72

Browse files
committed
Apply #3207 to Appraisals
1 parent a9e7dc6 commit 03baf72

File tree

5 files changed

+13
-9
lines changed

5 files changed

+13
-9
lines changed

Appraisals

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ appraise "rails-5.0" do
1010
group :active_record do
1111
gem 'paper_trail', '>= 5.0'
1212

13-
platforms :ruby, :mswin, :mingw do
13+
platforms :ruby, :mswin, :mingw, :x64_mingw do
1414
gem 'sqlite3', '~> 1.3.0'
1515
end
1616

gemfiles/rails_5.0.gemfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ gem "sassc-rails", "~> 2.1"
1111
group :active_record do
1212
gem "paper_trail", ">= 5.0"
1313

14-
platforms :ruby, :mswin, :mingw do
14+
platforms :ruby, :mswin, :mingw, :x64_mingw do
1515
gem "mysql2", ">= 0.3.14"
1616
gem "sqlite3", "~> 1.3.0"
1717
end
@@ -28,6 +28,7 @@ group :development, :test do
2828
end
2929

3030
group :test do
31+
gem "cancancan", "~> 2.0"
3132
gem "carrierwave", [">= 2.0.0.rc", "< 3"]
3233
gem "coveralls"
3334
gem "database_cleaner", [">= 1.2", "!= 1.4.0", "!= 1.5.0"]
@@ -48,7 +49,7 @@ group :test do
4849
gem "shrine", "~> 2.0"
4950
gem "shrine-memory"
5051
gem "timecop", ">= 0.5"
51-
gem "cancancan", "~> 2.0"
52+
gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
5253

5354
platforms :ruby_19 do
5455
gem "tins", "~> 1.6.0", require: false

gemfiles/rails_5.1.gemfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ group :active_record do
1212
gem "paper_trail", ">= 5.0"
1313
gem "pg", "~> 0.14", platforms: :ruby
1414

15-
platforms :ruby, :mswin, :mingw do
15+
platforms :ruby, :mswin, :mingw, :x64_mingw do
1616
gem "mysql2", ">= 0.3.14"
1717
gem "sqlite3", ">= 1.3"
1818
end
@@ -29,6 +29,7 @@ group :development, :test do
2929
end
3030

3131
group :test do
32+
gem "cancancan", "~> 2.0"
3233
gem "carrierwave", [">= 2.0.0.rc", "< 3"]
3334
gem "coveralls"
3435
gem "database_cleaner", [">= 1.2", "!= 1.4.0", "!= 1.5.0"]
@@ -49,7 +50,7 @@ group :test do
4950
gem "shrine", "~> 2.0"
5051
gem "shrine-memory"
5152
gem "timecop", ">= 0.5"
52-
gem "cancancan", "~> 2.0"
53+
gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
5354

5455
platforms :ruby_19 do
5556
gem "tins", "~> 1.6.0", require: false

gemfiles/rails_5.2.gemfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ group :active_record do
1212
gem "paper_trail", ">= 5.0"
1313
gem "pg", ">= 1.0.0", platforms: :ruby
1414

15-
platforms :ruby, :mswin, :mingw do
15+
platforms :ruby, :mswin, :mingw, :x64_mingw do
1616
gem "mysql2", ">= 0.3.14"
1717
gem "sqlite3", ">= 1.3"
1818
end
@@ -29,6 +29,7 @@ group :development, :test do
2929
end
3030

3131
group :test do
32+
gem "cancancan", "~> 2.0"
3233
gem "carrierwave", [">= 2.0.0.rc", "< 3"]
3334
gem "coveralls"
3435
gem "database_cleaner", [">= 1.2", "!= 1.4.0", "!= 1.5.0"]
@@ -49,7 +50,7 @@ group :test do
4950
gem "shrine", "~> 2.0"
5051
gem "shrine-memory"
5152
gem "timecop", ">= 0.5"
52-
gem "cancancan", "~> 2.0"
53+
gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
5354

5455
platforms :ruby_19 do
5556
gem "tins", "~> 1.6.0", require: false

gemfiles/rails_6.0.gemfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ group :active_record do
1212
gem "paper_trail", ">= 5.0"
1313
gem "pg", ">= 1.0.0", platforms: :ruby
1414

15-
platforms :ruby, :mswin, :mingw do
15+
platforms :ruby, :mswin, :mingw, :x64_mingw do
1616
gem "mysql2", ">= 0.3.14"
1717
gem "sqlite3", ">= 1.3"
1818
end
@@ -23,6 +23,7 @@ group :development, :test do
2323
end
2424

2525
group :test do
26+
gem "cancancan", "~> 3.0"
2627
gem "carrierwave", [">= 2.0.0.rc", "< 3"]
2728
gem "coveralls"
2829
gem "database_cleaner", [">= 1.2", "!= 1.4.0", "!= 1.5.0"]
@@ -43,7 +44,7 @@ group :test do
4344
gem "shrine", "~> 2.0"
4445
gem "shrine-memory"
4546
gem "timecop", ">= 0.5"
46-
gem "cancancan", "~> 3.0"
47+
gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
4748

4849
platforms :ruby_19 do
4950
gem "tins", "~> 1.6.0", require: false

0 commit comments

Comments
 (0)