Merge pull request #429 from mokhan/rails-6

Upgrade to Rails 6.0.0
flippercloud · Sep 12, 2019 · 334055f · 334055f
2 parents 51d7c84 + 09358ca
commit 334055f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,7 +14,7 @@ services:
   - mongodb
   - memcached
 env:
-  - RAILS_VERSION=6.0.0.rc1 SQLITE3_VERSION=1.4.1
+  - RAILS_VERSION=6.0.0 SQLITE3_VERSION=1.4.1
   - RAILS_VERSION=5.2.3
   - RAILS_VERSION=5.1.4
   - RAILS_VERSION=5.0.0
@@ -30,10 +30,10 @@ matrix:
     - rvm: 2.1
       env: RAILS_VERSION=5.2.3
     - rvm: 2.1
-      env: RAILS_VERSION=6.0.0.rc1 SQLITE3_VERSION=1.4.1
+      env: RAILS_VERSION=6.0.0 SQLITE3_VERSION=1.4.1
     - rvm: 2.2
-      env: RAILS_VERSION=6.0.0.rc1 SQLITE3_VERSION=1.4.1
+      env: RAILS_VERSION=6.0.0 SQLITE3_VERSION=1.4.1
     - rvm: 2.3
-      env: RAILS_VERSION=6.0.0.rc1 SQLITE3_VERSION=1.4.1
+      env: RAILS_VERSION=6.0.0 SQLITE3_VERSION=1.4.1
     - rvm: 2.4
-      env: RAILS_VERSION=6.0.0.rc1 SQLITE3_VERSION=1.4.1
+      env: RAILS_VERSION=6.0.0 SQLITE3_VERSION=1.4.1
diff --git a/docs/active_record/README.md b/docs/active_record/README.md
@@ -7,6 +7,7 @@ Supported Active Record versions:
 * 3.2.x
 * 4.2.x
 * 5.0.x
+* 6.0.x
 
 ## Installation
 

diff --git a/script/test b/script/test
@@ -32,7 +32,7 @@ export RAILS_VERSION=5.2.3
 script/bootstrap || bundle update
 bundle exec rake
 
-export RAILS_VERSION=6.0.0.rc1
+export RAILS_VERSION=6.0.0
 export SQLITE3_VERSION=1.4.1
 script/bootstrap || bundle update
 bundle exec rake