From 306eaed0f7dfb185150d43e0ab1f94173e7d4f90 Mon Sep 17 00:00:00 2001
From: smudge <nathan@betterment.com>
Date: Tue, 15 Oct 2019 17:50:08 -0400
Subject: [PATCH 1/2] Add Rails 6 appraisal

---
 Appraisals                 | 4 ++++
 gemfiles/rails_6.0.gemfile | 7 +++++++
 2 files changed, 11 insertions(+)
 create mode 100644 gemfiles/rails_6.0.gemfile

diff --git a/Appraisals b/Appraisals
index 118b43fc..353d0202 100644
--- a/Appraisals
+++ b/Appraisals
@@ -12,3 +12,7 @@ end
 appraise 'rails-5.2' do
   gem 'rails', '~> 5.2.0'
 end
+
+appraise 'rails-6.0' do
+  gem 'rails', '~> 6.0.0'
+end
diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile
new file mode 100644
index 00000000..15b9b275
--- /dev/null
+++ b/gemfiles/rails_6.0.gemfile
@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 6.0.0"
+
+gemspec path: "../"

From e57494d0d9b73560481b3a3b077915f5f6a6b664 Mon Sep 17 00:00:00 2001
From: smudge <nathan@betterment.com>
Date: Tue, 15 Oct 2019 17:51:06 -0400
Subject: [PATCH 2/2] Update travis config to use 6.0 instead of rc1

---
 .travis.yml                  | 6 +++---
 gemfiles/rails_6.rc1.gemfile | 7 -------
 2 files changed, 3 insertions(+), 10 deletions(-)
 delete mode 100644 gemfiles/rails_6.rc1.gemfile

diff --git a/.travis.yml b/.travis.yml
index 7b96bac7..d1c7dc5d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ gemfile:
   - gemfiles/rails_5.0.gemfile
   - gemfiles/rails_5.1.gemfile
   - gemfiles/rails_5.2.gemfile
-  - gemfiles/rails_6.rc1.gemfile
+  - gemfiles/rails_6.0.gemfile
 script: "bundle exec rspec && bundle exec codeclimate-test-reporter"
 before_install:
   - sudo add-apt-repository ppa:chris-lea/libsodium -y
@@ -23,7 +23,7 @@ before_install:
 matrix:
   fast_finish: true
   exclude:
-    - gemfile: gemfiles/rails_6.rc1.gemfile
+    - gemfile: gemfiles/rails_6.0.gemfile
       rvm: 2.3
-    - gemfile: gemfiles/rails_6.rc1.gemfile
+    - gemfile: gemfiles/rails_6.0.gemfile
       rvm: 2.4
diff --git a/gemfiles/rails_6.rc1.gemfile b/gemfiles/rails_6.rc1.gemfile
deleted file mode 100644
index 257a95ae..00000000
--- a/gemfiles/rails_6.rc1.gemfile
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem 'rails', '~> 6.0.0.rc1'
-
-gemspec path: "../"