From 07f3836f0e6d8895392a5ef9f1b005c4d7ce9fb3 Mon Sep 17 00:00:00 2001
From: Richard Lee <14349+dlackty@users.noreply.github.com>
Date: Mon, 17 Aug 2020 03:07:53 +0800
Subject: [PATCH 1/5] Add Sprocket's new manifest file to dummy app

---
 spec/dummy/app/assets/config/manifest.js | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 spec/dummy/app/assets/config/manifest.js

diff --git a/spec/dummy/app/assets/config/manifest.js b/spec/dummy/app/assets/config/manifest.js
new file mode 100644
index 0000000..e0020d0
--- /dev/null
+++ b/spec/dummy/app/assets/config/manifest.js
@@ -0,0 +1,2 @@
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css
\ No newline at end of file

From a199e613a22f44529f43c551cb95cda55596eddf Mon Sep 17 00:00:00 2001
From: Richard Lee <14349+dlackty@users.noreply.github.com>
Date: Mon, 17 Aug 2020 03:08:15 +0800
Subject: [PATCH 2/5] Update Ruby versions

---
 .travis.yml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 82cf996..bb1306f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,11 +5,10 @@ before_install:
   - gem update --system
 
 rvm:
-  - 2.2
-  - 2.3
   - 2.4
   - 2.5
   - 2.6
+  - 2.7
 
 env:
   - RAILS_VERSION=4.2
@@ -19,12 +18,6 @@ env:
 
 matrix:
   exclude:
-    - rvm: 2.2
-      env: RAILS_VERSION=5.0
-    - rvm: 2.2
-      env: RAILS_VERSION=5.1
-    - rvm: 2.2
-      env: RAILS_VERSION=5.2
     - rvm: 2.5
       env: RAILS_VERSION=4.2
     - rvm: 2.5

From c6b5c79af8012c2a59378aa2c0da4244189736a1 Mon Sep 17 00:00:00 2001
From: Richard Lee <14349+dlackty@users.noreply.github.com>
Date: Mon, 17 Aug 2020 03:08:29 +0800
Subject: [PATCH 3/5] Add Rails 6 to test target

---
 .travis.yml          |  1 +
 Gemfile              |  2 +-
 gemfiles/6.0.gemfile | 12 ++++++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 gemfiles/6.0.gemfile

diff --git a/.travis.yml b/.travis.yml
index bb1306f..d5410a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,7 @@ env:
   - RAILS_VERSION=5.0
   - RAILS_VERSION=5.1
   - RAILS_VERSION=5.2
+  - RAILS_VERSION=6.0
 
 matrix:
   exclude:
diff --git a/Gemfile b/Gemfile
index 45fa91c..84535a4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,6 +5,6 @@ source "http://rubygems.org"
 # development dependencies will be added by default to the :development group.
 gemspec
 
-version = ENV['RAILS_VERSION'] || "4.0"
+version = ENV['RAILS_VERSION'] || "4.2"
 
 eval_gemfile File.expand_path("../gemfiles/#{version}.gemfile", __FILE__)
diff --git a/gemfiles/6.0.gemfile b/gemfiles/6.0.gemfile
new file mode 100644
index 0000000..c322737
--- /dev/null
+++ b/gemfiles/6.0.gemfile
@@ -0,0 +1,12 @@
+gem 'puma'
+gem 'jquery-rails'
+gem 'jquery-ui-rails'
+gem 'ancestry'
+gem 'sqlite3', '~> 1.4'
+
+gem 'activeadmin'
+gem 'devise'
+gem 'rails', '~> 6.0.0'
+gem 'sass-rails'
+
+# vim: ft=ruby

From 0c31b41fe85cc0b09f6fd3627c5c7c0c92d52947 Mon Sep 17 00:00:00 2001
From: Richard Lee <14349+dlackty@users.noreply.github.com>
Date: Mon, 17 Aug 2020 11:47:48 +0800
Subject: [PATCH 4/5] Fix up bundler version issue

---
 .travis.yml | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d5410a1..9051b1f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,5 @@
 language: ruby
 
-before_install:
-  # Workaround for https://github.com/travis-ci/travis-ci/issues/8969
-  - gem update --system
-
 rvm:
   - 2.4
   - 2.5
@@ -18,14 +14,23 @@ env:
   - RAILS_VERSION=6.0
 
 matrix:
+  include:
+    - rvm: 2.4
+      before_install:
+        # Source: <https://docs.travis-ci.com/user/languages/ruby/#bundler-20>
+        - gem update --system '2.7.8' --no-document
+        - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+        - gem install bundler -v '< 2' --no-document
   exclude:
-    - rvm: 2.5
-      env: RAILS_VERSION=4.2
-    - rvm: 2.5
-      env: RAILS_VERSION=5.0
+    - rvm: 2.4
+      env: RAILS_VERSION=6.0
     - rvm: 2.6
       env: RAILS_VERSION=4.2
     - rvm: 2.6
       env: RAILS_VERSION=5.0
+    - rvm: 2.7
+      env: RAILS_VERSION=4.2
+    - rvm: 2.7
+      env: RAILS_VERSION=5.0
 
 sudo: false

From 9cf3c09c06d1b7b5e9336de52f342e8bc2d07a8d Mon Sep 17 00:00:00 2001
From: Richard Lee <14349+dlackty@users.noreply.github.com>
Date: Mon, 17 Aug 2020 17:56:39 +0800
Subject: [PATCH 5/5] Cache bundler for CI

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 9051b1f..255108e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,3 +34,4 @@ matrix:
       env: RAILS_VERSION=5.0
 
 sudo: false
+cache: bundler