From 7bb37914b406d99b6e46472ef69123300689035f Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Sat, 17 Aug 2019 10:53:13 +0100
Subject: [PATCH] Update Rails 6: 6.0.0.rc2 -> 6.0.0

---
 Gemfile                         |  4 ++--
 heroku.gemfile                  |  4 ++--
 spec/gemfiles/rails_6_0.gemfile | 14 ++++++++++----
 thredded.gemspec                |  2 +-
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index 066446c58..cae4ef07a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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'
diff --git a/heroku.gemfile b/heroku.gemfile
index ad3d4833f..a5356ac46 100644
--- a/heroku.gemfile
+++ b/heroku.gemfile
@@ -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'
@@ -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'
diff --git a/spec/gemfiles/rails_6_0.gemfile b/spec/gemfiles/rails_6_0.gemfile
index 5ce064c5f..82901c3c9 100644
--- a/spec/gemfiles/rails_6_0.gemfile
+++ b/spec/gemfiles/rails_6_0.gemfile
@@ -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'
diff --git a/thredded.gemspec b/thredded.gemspec
index 63cecbabb..fb9f7709e 100644
--- a/thredded.gemspec
+++ b/thredded.gemspec
@@ -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