Merge pull request #678 from Data-Liberation-Front/resumable-upload-update

update resumable-upload

Author: Floppy

Gemfile

@@ -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'
+gem 'resumable_upload', git: 'https://github.com/Data-Liberation-Front/resumable-upload.git', ref: 'v0.1.0'
 gem 'pusher', '~> 1.4'
 gem 'cloudflare', '~> 2.1'
 

Gemfile.lock

@@ -39,10 +39,11 @@ GIT
       bson (~> 3.0)
 
 GIT
-  remote: https://github.com/Data-Liberation-Front/resumable-upload
-  revision: 4889690832cd46b5581b768703dc929969e759dd
+  remote: https://github.com/Data-Liberation-Front/resumable-upload.git
+  revision: e3f043392da456bf57a8b1696bae4434d215183b
+  ref: v0.1.0
   specs:
-    resumable_upload (0.0.2)
+    resumable_upload (0.1.0)
       dotenv
       fog (~> 1.36)
       rails (~> 4.0)
@@ -199,7 +200,7 @@ GEM
     ethon (0.12.0)
       ffi (>= 1.3.0)
     eventmachine (1.2.7)
-    excon (0.78.1)
+    excon (0.92.3)
     execjs (2.7.0)
     factory_bot (5.2.0)
       activesupport (>= 4.2.0)
@@ -302,7 +303,7 @@ GEM
     fog-json (1.2.0)
       fog-core
       multi_json (~> 1.10)
-    fog-local (0.6.0)
+    fog-local (0.8.0)
       fog-core (>= 1.27, < 3.0)
     fog-openstack (0.3.10)
       fog-core (>= 1.45, <= 2.1.0)
@@ -349,14 +350,14 @@ GEM
     fog-voxel (0.1.0)
       fog-core
       fog-xml
-    fog-vsphere (3.5.0)
+    fog-vsphere (3.5.2)
       fog-core
       rbvmomi (>= 1.9, < 3)
     fog-xenserver (1.0.0)
       fog-core
       fog-xml
       xmlrpc
-    fog-xml (0.1.3)
+    fog-xml (0.1.4)
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
     font-awesome-rails (4.7.0.7)
@@ -751,11 +752,14 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.7.0)
     websocket-driver (0.5.4)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    xml-simple (1.1.8)
-    xmlrpc (0.3.1)
+    xml-simple (1.1.9)
+      rexml
+    xmlrpc (0.3.2)
+      webrick
     xpath (2.0.0)
       nokogiri (~> 1.3)