From ea66682f134d80ebe4c143ce913b3e37e16ef1e6 Mon Sep 17 00:00:00 2001
From: "Tada, Tadashi" <t@tdtds.jp>
Date: Wed, 2 Oct 2019 17:16:29 +0900
Subject: [PATCH 1/2] update ruby to 2.6.5 on Heroku and update bundles

---
 Gemfile.lock                   | 12 ++++++------
 misc/paas/heroku/Gemfile.local |  2 +-
 misc/paas/heroku/Gemfile.lock  | 16 ++++++++--------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 40f8d5d38..0b72c3022 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -28,7 +28,7 @@ GEM
     docile (1.3.2)
     emot (0.0.4)
       thor
-    faraday (0.15.4)
+    faraday (0.16.2)
       multipart-post (>= 1.2, < 3)
     fastimage (2.1.7)
     hikidoc (0.1.0)
@@ -88,14 +88,14 @@ GEM
     rspec-support (3.8.2)
     ruby-debug-ide (0.7.0)
       rake (>= 0.8.1)
-    rubyzip (1.3.0)
+    rubyzip (2.0.0)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
-    selenium-webdriver (3.142.4)
+    selenium-webdriver (3.142.5)
       childprocess (>= 0.5, < 3.0)
-      rubyzip (~> 1.2, >= 1.2.2)
-    sequel (5.24.0)
+      rubyzip (>= 1.2.2)
+    sequel (5.25.0)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -104,7 +104,7 @@ GEM
     sqlite3 (1.4.1)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
-    test-unit (3.3.3)
+    test-unit (3.3.4)
       power_assert
     thor (0.20.3)
     tins (1.21.1)
diff --git a/misc/paas/heroku/Gemfile.local b/misc/paas/heroku/Gemfile.local
index 326962670..ef0c4faad 100644
--- a/misc/paas/heroku/Gemfile.local
+++ b/misc/paas/heroku/Gemfile.local
@@ -1,4 +1,4 @@
-ruby '~> 2.6.4'
+ruby '~> 2.6.5'
 gem 'puma', require: false
 gem 'tdiary-io-mongodb', git: 'https://github.com/tdiary/tdiary-io-mongodb.git'
 gem 'tdiary-contrib', git: 'https://github.com/tdiary/tdiary-contrib.git'
diff --git a/misc/paas/heroku/Gemfile.lock b/misc/paas/heroku/Gemfile.lock
index 268e37e3c..d600c80b5 100644
--- a/misc/paas/heroku/Gemfile.lock
+++ b/misc/paas/heroku/Gemfile.lock
@@ -59,7 +59,7 @@ GEM
     docile (1.3.2)
     emot (0.0.4)
       thor
-    faraday (0.15.4)
+    faraday (0.16.2)
       multipart-post (>= 1.2, < 3)
     fastimage (2.1.7)
     hashie (3.6.0)
@@ -85,7 +85,7 @@ GEM
     mime-types-data (3.2019.0904)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.12.0)
+    minitest (5.12.2)
     mongo (2.8.0)
       bson (>= 4.4.2, < 5.0.0)
     mongoid (7.0.5)
@@ -149,14 +149,14 @@ GEM
       rake (>= 0.8.1)
     ruby-enum (0.7.2)
       i18n
-    rubyzip (1.3.0)
+    rubyzip (2.0.0)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
-    selenium-webdriver (3.142.4)
+    selenium-webdriver (3.142.5)
       childprocess (>= 0.5, < 3.0)
-      rubyzip (~> 1.2, >= 1.2.2)
-    sequel (5.24.0)
+      rubyzip (>= 1.2.2)
+    sequel (5.25.0)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -180,7 +180,7 @@ GEM
       rdtool
     term-ansicolor (1.7.1)
       tins (~> 1.0)
-    test-unit (3.3.3)
+    test-unit (3.3.4)
       power_assert
     thor (0.20.3)
     thread_safe (0.3.6)
@@ -236,7 +236,7 @@ DEPENDENCIES
   test-unit
 
 RUBY VERSION
-   ruby 2.6.4p104
+   ruby 2.6.5p114
 
 BUNDLED WITH
    2.0.2

From 2f395b8584609ed710dd28ed964aebd17dcb77e8 Mon Sep 17 00:00:00 2001
From: "Tada, Tadashi" <t@tdtds.jp>
Date: Thu, 3 Oct 2019 10:21:35 +0900
Subject: [PATCH 2/2] update ruby to 2.5.7 and 2.6.5 on TravisCI

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9682f11fd..2d30d194e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,8 @@ services: memcache
 
 rvm:
   - 2.4.7
-  - 2.5.6
-  - 2.6.4
+  - 2.5.7
+  - 2.6.5
   - ruby-head
 
 matrix: