Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@mshibuya
mshibuya committed Feb 28, 2021
1 parent 7434497 commit 15184e4
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 22 deletions.
9 changes: 7 additions & 2 deletions Appraisals
View file
Expand Up @@ -5,6 +5,7 @@ appraise "rails-5.0" do

group :test do
gem 'cancancan', '~> 2.0'
gem 'paperclip', ['>= 3.4', '!= 4.3.0']
end

group :active_record do
Expand Down Expand Up @@ -38,6 +39,7 @@ appraise "rails-5.1" do

group :test do
gem 'cancancan', '~> 2.0'
gem 'paperclip', ['>= 3.4', '!= 4.3.0']
end

group :active_record do
Expand Down Expand Up @@ -68,6 +70,7 @@ appraise "rails-5.2" do

group :test do
gem 'cancancan', '~> 2.0'
gem 'paperclip', ['>= 3.4', '!= 4.3.0']
end

group :active_record do
Expand Down Expand Up @@ -99,6 +102,7 @@ appraise "rails-6.0" do

group :test do
gem 'cancancan', '~> 3.0'
gem 'paperclip', ['>= 3.4', '!= 4.3.0']
gem 'rspec-rails', '>= 4.0.0.beta2'
end

Expand All @@ -124,18 +128,19 @@ appraise "rails-6.0" do
end

appraise "rails-6.1" do
gem 'rails', '~> 6.1.0.rc1'
gem 'rails', '~> 6.1.0'
gem 'haml'
gem 'sassc-rails', '~> 2.1'
gem 'devise', '~> 4.7'

group :test do
gem 'cancancan', '~> 3.0', github: 'ghiculescu/cancancan', branch: 'avoid-resolve_column_aliases-2'
gem 'cancancan', '~> 3.2'
gem 'rspec-rails', '>= 4.0.0.beta2'
end

group :active_record do
gem 'pg', '>= 1.0.0', platforms: :ruby
gem 'paper_trail', '>= 5.0'
gem 'kt-paperclip'
end
end
5 changes: 2 additions & 3 deletions Gemfile
View file
Expand Up @@ -27,15 +27,14 @@ group :test do
gem 'generator_spec', '>= 0.8'
gem 'launchy', '>= 2.2'
gem 'mini_magick', '>= 3.4'
gem 'paperclip', ['>= 3.4', '!= 4.3.0']
gem 'poltergeist', '~> 1.5'
gem 'pundit'
gem 'rack-cache', require: 'rack/cache'
gem 'rspec-rails', '>= 2.14'
gem 'rspec-expectations', '!= 3.8.3'
gem 'rspec-retry'
gem 'rubocop', '~> 0.68.1'
gem 'rubocop-performance'
gem 'rubocop', '~> 0.68.1', require: false
gem 'rubocop-performance', require: false
gem 'simplecov', '>= 0.9', require: false
gem 'simplecov-lcov', require: false
gem 'shrine', '~> 2.0'
Expand Down
6 changes: 3 additions & 3 deletions gemfiles/rails_5.0.gemfile
View file
Expand Up @@ -36,21 +36,21 @@ group :test do
gem "generator_spec", ">= 0.8"
gem "launchy", ">= 2.2"
gem "mini_magick", ">= 3.4"
gem "paperclip", [">= 3.4", "!= 4.3.0"]
gem "poltergeist", "~> 1.5"
gem "pundit"
gem "rack-cache", require: "rack/cache"
gem "rspec-rails", ">= 2.14"
gem "rspec-expectations", "!= 3.8.3"
gem "rspec-retry"
gem "rubocop", "~> 0.68.1"
gem "rubocop-performance"
gem "rubocop", "~> 0.68.1", require: false
gem "rubocop-performance", require: false
gem "simplecov", ">= 0.9", require: false
gem "simplecov-lcov", require: false
gem "shrine", "~> 2.0"
gem "shrine-memory"
gem "timecop", ">= 0.5"
gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
gem "paperclip", [">= 3.4", "!= 4.3.0"]

platforms :ruby_19 do
gem "tins", "~> 1.6.0", require: false
Expand Down
6 changes: 3 additions & 3 deletions gemfiles/rails_5.1.gemfile
View file
Expand Up @@ -37,21 +37,21 @@ group :test do
gem "generator_spec", ">= 0.8"
gem "launchy", ">= 2.2"
gem "mini_magick", ">= 3.4"
gem "paperclip", [">= 3.4", "!= 4.3.0"]
gem "poltergeist", "~> 1.5"
gem "pundit"
gem "rack-cache", require: "rack/cache"
gem "rspec-rails", ">= 2.14"
gem "rspec-expectations", "!= 3.8.3"
gem "rspec-retry"
gem "rubocop", "~> 0.68.1"
gem "rubocop-performance"
gem "rubocop", "~> 0.68.1", require: false
gem "rubocop-performance", require: false
gem "simplecov", ">= 0.9", require: false
gem "simplecov-lcov", require: false
gem "shrine", "~> 2.0"
gem "shrine-memory"
gem "timecop", ">= 0.5"
gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
gem "paperclip", [">= 3.4", "!= 4.3.0"]

platforms :ruby_19 do
gem "tins", "~> 1.6.0", require: false
Expand Down
6 changes: 3 additions & 3 deletions gemfiles/rails_5.2.gemfile
View file
Expand Up @@ -37,21 +37,21 @@ group :test do
gem "generator_spec", ">= 0.8"
gem "launchy", ">= 2.2"
gem "mini_magick", ">= 3.4"
gem "paperclip", [">= 3.4", "!= 4.3.0"]
gem "poltergeist", "~> 1.5"
gem "pundit"
gem "rack-cache", require: "rack/cache"
gem "rspec-rails", ">= 2.14"
gem "rspec-expectations", "!= 3.8.3"
gem "rspec-retry"
gem "rubocop", "~> 0.68.1"
gem "rubocop-performance"
gem "rubocop", "~> 0.68.1", require: false
gem "rubocop-performance", require: false
gem "simplecov", ">= 0.9", require: false
gem "simplecov-lcov", require: false
gem "shrine", "~> 2.0"
gem "shrine-memory"
gem "timecop", ">= 0.5"
gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
gem "paperclip", [">= 3.4", "!= 4.3.0"]

platforms :ruby_19 do
gem "tins", "~> 1.6.0", require: false
Expand Down
6 changes: 3 additions & 3 deletions gemfiles/rails_6.0.gemfile
View file
Expand Up @@ -37,21 +37,21 @@ group :test do
gem "generator_spec", ">= 0.8"
gem "launchy", ">= 2.2"
gem "mini_magick", ">= 3.4"
gem "paperclip", [">= 3.4", "!= 4.3.0"]
gem "poltergeist", "~> 1.5"
gem "pundit"
gem "rack-cache", require: "rack/cache"
gem "rspec-rails", ">= 4.0.0.beta2"
gem "rspec-expectations", "!= 3.8.3"
gem "rspec-retry"
gem "rubocop", "~> 0.68.1"
gem "rubocop-performance"
gem "rubocop", "~> 0.68.1", require: false
gem "rubocop-performance", require: false
gem "simplecov", ">= 0.9", require: false
gem "simplecov-lcov", require: false
gem "shrine", "~> 2.0"
gem "shrine-memory"
gem "timecop", ">= 0.5"
gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
gem "paperclip", [">= 3.4", "!= 4.3.0"]

platforms :ruby_19 do
gem "tins", "~> 1.6.0", require: false
Expand Down
10 changes: 5 additions & 5 deletions gemfiles/rails_6.1.gemfile
View file
Expand Up @@ -3,14 +3,15 @@
source "https://rubygems.org"

gem "appraisal", ">= 2.0"
gem "rails", "~> 6.1.0.rc1"
gem "rails", "~> 6.1.0"
gem "haml"
gem "devise", "~> 4.7"
gem "sassc-rails", "~> 2.1"

group :active_record do
gem "paper_trail", ">= 5.0"
gem "pg", ">= 1.0.0", platforms: :ruby
gem "kt-paperclip"

platforms :ruby, :mswin, :mingw, :x64_mingw do
gem "mysql2", ">= 0.3.14"
Expand All @@ -23,23 +24,22 @@ group :development, :test do
end

group :test do
gem "cancancan", "~> 3.0", github: "ghiculescu/cancancan", branch: "avoid-resolve_column_aliases-2"
gem "cancancan", "~> 3.2"
gem "carrierwave", [">= 2.0.0.rc", "< 3"]
gem "database_cleaner", [">= 1.2", "!= 1.4.0", "!= 1.5.0", "< 2.0"]
gem "dragonfly", "~> 1.0"
gem "factory_bot", ">= 4.2"
gem "generator_spec", ">= 0.8"
gem "launchy", ">= 2.2"
gem "mini_magick", ">= 3.4"
gem "paperclip", [">= 3.4", "!= 4.3.0"]
gem "poltergeist", "~> 1.5"
gem "pundit"
gem "rack-cache", require: "rack/cache"
gem "rspec-rails", ">= 4.0.0.beta2"
gem "rspec-expectations", "!= 3.8.3"
gem "rspec-retry"
gem "rubocop", "~> 0.68.1"
gem "rubocop-performance"
gem "rubocop", "~> 0.68.1", require: false
gem "rubocop-performance", require: false
gem "simplecov", ">= 0.9", require: false
gem "simplecov-lcov", require: false
gem "shrine", "~> 2.0"
Expand Down

0 comments on commit 15184e4

Please sign in to comment.