From a430644a768a41ee1d06145b6dfa765a00c1f875 Mon Sep 17 00:00:00 2001
From: tsayen <anatoly.sayenko@gmail.com>
Date: Thu, 17 Oct 2019 23:41:55 +0200
Subject: [PATCH 1/2] upgrade ruby version

---
 .ruby-version |  2 +-
 .travis.yml   |  2 +-
 Gemfile.lock  | 12 ++++++------
 db/schema.rb  | 26 +++++++++++++-------------
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/.ruby-version b/.ruby-version
index 0bee604df..57cf282eb 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.3.3
+2.6.5
diff --git a/.travis.yml b/.travis.yml
index 501560eae..a819d6f5b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ before_script:
 cache: bundler
 language: ruby
 rvm:
-  - 2.3.3
+  - 2.6.5
   - ruby-head
 matrix:
   allow_failures:
diff --git a/Gemfile.lock b/Gemfile.lock
index 2da311c96..1105a17ea 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -31,7 +31,7 @@ GEM
       xpath (~> 2.0)
     coderay (1.1.1)
     columnize (0.9.0)
-    concurrent-ruby (1.0.2)
+    concurrent-ruby (1.1.5)
     coveralls (0.8.13)
       json (~> 1.8)
       simplecov (~> 0.11.0)
@@ -40,8 +40,8 @@ GEM
       tins (~> 1.6.0)
     crass (1.0.3)
     debugger-linecache (1.2.0)
-    delayed_job (4.1.1)
-      activesupport (>= 3.0, < 5.0)
+    delayed_job (4.1.8)
+      activesupport (>= 3.0, < 6.1)
     delayed_job_active_record (4.1.0)
       activerecord (>= 3.0, < 5)
       delayed_job (>= 3.0, < 5)
@@ -73,7 +73,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0221)
     mini_portile2 (2.3.0)
-    minitest (5.11.3)
+    minitest (5.12.2)
     multi_json (1.12.1)
     multipart-post (2.0.0)
     nokogiri (1.8.2)
@@ -219,7 +219,7 @@ DEPENDENCIES
   will_paginate (~> 3.1)
 
 RUBY VERSION
-   ruby 2.3.3p222
+   ruby 2.6.5p114
 
 BUNDLED WITH
-   1.16.1
+   1.17.2
diff --git a/db/schema.rb b/db/schema.rb
index 3f7ef303d..3f33b80fe 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -15,7 +15,7 @@
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
-  create_table "delayed_jobs", force: true do |t|
+  create_table "delayed_jobs", force: :cascade do |t|
     t.integer  "priority",   default: 0
     t.integer  "attempts",   default: 0
     t.text     "handler"
@@ -25,37 +25,37 @@
     t.datetime "failed_at"
     t.string   "locked_by"
     t.string   "queue"
-    t.datetime "created_at",             null: false
-    t.datetime "updated_at",             null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
   add_index "delayed_jobs", ["priority", "run_at"], name: "delayed_jobs_priority", using: :btree
 
-  create_table "feeds", force: true do |t|
+  create_table "feeds", force: :cascade do |t|
     t.string   "name"
     t.text     "url"
     t.datetime "last_fetched"
-    t.datetime "created_at",   null: false
-    t.datetime "updated_at",   null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.integer  "status"
     t.integer  "group_id"
   end
 
   add_index "feeds", ["url"], name: "index_feeds_on_url", unique: true, using: :btree
 
-  create_table "groups", force: true do |t|
+  create_table "groups", force: :cascade do |t|
     t.string   "name",       null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end
 
-  create_table "stories", force: true do |t|
+  create_table "stories", force: :cascade do |t|
     t.text     "title"
     t.text     "permalink"
     t.text     "body"
     t.integer  "feed_id"
-    t.datetime "created_at",                  null: false
-    t.datetime "updated_at",                  null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.datetime "published"
     t.boolean  "is_read"
     t.boolean  "keep_unread", default: false
@@ -65,10 +65,10 @@
 
   add_index "stories", ["entry_id", "feed_id"], name: "index_stories_on_entry_id_and_feed_id", unique: true, using: :btree
 
-  create_table "users", force: true do |t|
+  create_table "users", force: :cascade do |t|
     t.string   "password_digest"
-    t.datetime "created_at",      null: false
-    t.datetime "updated_at",      null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.boolean  "setup_complete"
     t.string   "api_key"
   end

From 573e0e7e6e5222430bd32d3ae7f60ae645d97bcd Mon Sep 17 00:00:00 2001
From: tsayen <anatoly.sayenko@gmail.com>
Date: Fri, 18 Oct 2019 08:51:04 +0200
Subject: [PATCH 2/2] stabilize mocha tests (see
 https://github.com/nathanboktae/mocha-phantomjs-core/blob/master/README.md#usage)

---
 spec/javascript/spec/spec_helper.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/spec/javascript/spec/spec_helper.js b/spec/javascript/spec/spec_helper.js
index a35e11d48..e18c11a27 100644
--- a/spec/javascript/spec/spec_helper.js
+++ b/spec/javascript/spec/spec_helper.js
@@ -1,3 +1,7 @@
+if (typeof initMochaPhantomJS === 'function') {
+  initMochaPhantomJS()
+}
+
 mocha.ui('bdd');
 
 chai.should();