Merge pull request #683 from Data-Liberation-Front/ruby-2.6

Move to Ruby 2.6

Author: Floppy

.github/workflows/push.yml

@@ -15,7 +15,7 @@ jobs:
       - uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
-          ruby-version: 2.5
+          ruby-version: 2.6
       - name: Start MongoDB
         uses: supercharge/[email protected]
         with:

.ruby-version

@@ -1 +1 @@
-2.5.9
+2.6.9

Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-ruby '~> 2.5'
+ruby '~> 2.6'
 
 gem 'rake', '~> 13.0'
 gem 'rails', '~> 4.2'
@@ -95,7 +95,7 @@ gem 'jquery-dotdotdot-rails', '~> 1.6'
 gem 'alternate_rails', git: 'https://github.com/Data-Liberation-Front/alternate-rails.git', ref: 'v4.2.0'
 gem 'rack-cors', '~> 1.0'
 
-gem 'resumable_upload', git: 'https://github.com/Data-Liberation-Front/resumable-upload.git', ref: 'v0.1.0'
+gem 'resumable_upload', git: 'https://github.com/Data-Liberation-Front/resumable-upload.git', ref: 'v0.2.0'
 gem 'pusher', '~> 1.4'
 gem 'cloudflare', '~> 2.1'
 

Gemfile.lock

@@ -40,10 +40,10 @@ GIT
 
 GIT
   remote: https://github.com/Data-Liberation-Front/resumable-upload.git
-  revision: e3f043392da456bf57a8b1696bae4434d215183b
-  ref: v0.1.0
+  revision: 6350c156cbae90f3a49af4f900cfbed35904ad90
+  ref: v0.2.0
   specs:
-    resumable_upload (0.1.0)
+    resumable_upload (0.2.0)
       dotenv
       fog (~> 1.36)
       rails (~> 4.0)
@@ -188,7 +188,7 @@ GEM
     dotenv-rails (2.7.6)
       dotenv (= 2.7.6)
       railties (>= 3.2)
-    dry-inflector (0.2.0)
+    dry-inflector (0.2.1)
     ebnf (1.2.0)
       rdf (~> 3.1)
       sxp (~> 1.1)
@@ -830,7 +830,7 @@ DEPENDENCIES
   webmock (~> 3.12)
 
 RUBY VERSION
-   ruby 2.5.9p229
+   ruby 2.6.9p207
 
 BUNDLED WITH
    1.17.3

spec/support/patch_rails_42_action_controller_test_response.rb

@@ -0,0 +1,13 @@
+if RUBY_VERSION >= "2.6.0"
+  if Rails.version < "5"
+    module ActionController
+      class TestResponse < ActionDispatch::TestResponse
+        def recycle!
+          @mon_mutex_owner_object_id = nil
+          @mon_mutex = nil
+          initialize
+        end
+      end
+    end
+  end
+end