Skip to content

Commit

Permalink
Update Rails 6: 6.0.0.rc2 -> 6.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
glebm committed Aug 17, 2019
1 parent 8b2cda3 commit 7bb3791
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 9 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Expand Up @@ -2,8 +2,8 @@

source 'https://rubygems.org'

gem 'rails', '~> 6.0.0.rc2'
gem 'rails-i18n', '~> 6.0.0.beta1'
gem 'rails', '~> 6.0.0'
gem 'rails-i18n', '~> 6.0.0'

# https://github.com/rails/rails/blob/v6.0.0.rc1/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb#L12
gem 'sqlite3', '~> 1.3', '>= 1.3.6'
Expand Down
4 changes: 2 additions & 2 deletions heroku.gemfile
Expand Up @@ -7,7 +7,7 @@ gem 'thredded', path: File.dirname(__FILE__)

gem 'mustache'

gem 'rails', '~> 6.0.0.rc2'
gem 'rails', '~> 6.0.0'

# Use Uglifier as compressor for JavaScript assets
gem 'uglifier'
Expand All @@ -18,7 +18,7 @@ gem 'pg'
gem 'rails_email_preview', '>= 2.2.1'
gem 'roadie-rails'
gem 'turbolinks'
gem 'rails-i18n', '~> 6.0.0.beta1'
gem 'rails-i18n', '~> 6.0.0'
gem 'kaminari-i18n'
gem 'http_accept_language'
gem 'factory_bot'
Expand Down
14 changes: 10 additions & 4 deletions spec/gemfiles/rails_6_0.gemfile
Expand Up @@ -4,11 +4,17 @@ source 'https://rubygems.org'
gemspec path: '../../'
eval_gemfile '../../shared.gemfile'

gem 'rails', '~> 6.0.0.rc2'
gem 'rails-i18n', '~> 6.0.0.beta1'
gem 'rails', '~> 6.0.0'
gem 'rails-i18n', '~> 6.0.0'

# https://github.com/rails/rails/blob/v6.0.0.rc1/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb#L12
gem 'sqlite3', '~> 1.3', '>= 1.3.6'
# https://github.com/rails/rails/blob/v6.0.0/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb#L13
gem 'sqlite3', '~> 1.4'

# https://github.com/rails/rails/blob/v6.0.0/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb#L4
gem "pg", '>= 0.18', '< 2.0'

# https://github.com/rails/rails/blob/v6.0.0/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb#L6
gem 'mysql2', '>= 0.4.4'

group :test do
gem 'rails-controller-testing'
Expand Down
2 changes: 1 addition & 1 deletion thredded.gemspec
Expand Up @@ -29,7 +29,7 @@ Thredded works with SQLite, MySQL (v5.6.4+), and PostgreSQL. See the demo at htt
s.add_dependency 'kaminari'
s.add_dependency 'nokogiri'
s.add_dependency 'pundit', '>= 1.1.0'
s.add_dependency 'rails', '>= 4.2.10', '<= 6.0.0.rc2' # See https://github.com/thredded/thredded/issues/822
s.add_dependency 'rails', '>= 4.2.10'
s.add_dependency 'rb-gravatar'

# post rendering
Expand Down

0 comments on commit 7bb3791

Please sign in to comment.