diff --git a/Gemfile b/Gemfile index fbd6547b..915ba3f7 100644 --- a/Gemfile +++ b/Gemfile @@ -97,6 +97,6 @@ gem 'rack-cors', '~> 1.0' gem 'resumable_upload', git: 'https://github.com/Data-Liberation-Front/resumable-upload.git', ref: 'v0.2.0' gem 'pusher', '~> 2.0' -gem 'cloudflare', '~> 2.1' +gem 'cloudflare', '~> 4.3' gem "racc", "1.6.2" # temporary pin to build on ruby 2.4, can remove when ruby is upgraded diff --git a/Gemfile.lock b/Gemfile.lock index dd19ad0d..1b8f3a33 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -96,6 +96,25 @@ GEM nokogiri (~> 1.6) rest-client (~> 2.0) arel (6.0.4) + async (1.31.0) + console (~> 1.10) + nio4r (~> 2.3) + timers (~> 4.1) + async-http (0.59.5) + async (>= 1.25) + async-io (>= 1.28) + async-pool (>= 0.2) + protocol-http (~> 0.23) + protocol-http1 (~> 0.14.0) + protocol-http2 (~> 0.14.0) + traces (>= 0.8.0) + async-io (1.34.3) + async + async-pool (0.4.0) + async (>= 1.25) + async-rest (0.12.4) + async-http (~> 0.42) + protocol-http (~> 0.7) autoprefixer-rails (9.7.6) execjs backports (3.17.1) @@ -116,8 +135,8 @@ GEM rack-test (>= 0.5.4) xpath (~> 2.0) cliver (0.3.2) - cloudflare (2.1.0) - json (~> 1) + cloudflare (4.3.0) + async-rest (~> 0.12.3) coderay (1.1.3) coffee-rails (4.2.2) coffee-script (>= 2.2.0) @@ -129,6 +148,8 @@ GEM colorize (0.8.1) concurrent-ruby (1.2.2) connection_pool (2.3.0) + console (1.15.3) + fiber-local coveralls (0.8.23) json (>= 1.8, < 3) simplecov (~> 0.16.1) @@ -210,6 +231,7 @@ GEM faker (2.2.1) i18n (>= 0.8) ffi (1.15.5) + fiber-local (1.0.0) fission (0.5.0) CFPropertyList (~> 2.2) fog (1.41.0) @@ -516,6 +538,13 @@ GEM cliver (~> 0.3.1) multi_json (~> 1.0) websocket-driver (>= 0.2.0) + protocol-hpack (1.4.2) + protocol-http (0.24.1) + protocol-http1 (0.14.6) + protocol-http (~> 0.22) + protocol-http2 (0.14.2) + protocol-hpack (~> 1.4) + protocol-http (~> 0.18) pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) @@ -740,9 +769,11 @@ GEM thread_safe (0.3.6) tilt (2.0.10) timecop (0.9.6) + timers (4.3.5) tins (1.25.0) sync to_regexp (0.2.1) + traces (0.9.1) turbolinks (5.2.1) turbolinks-source (~> 5.2) turbolinks-source (5.2.0) @@ -784,7 +815,7 @@ DEPENDENCIES alternate_rails! bootstrap-kaminari-views (~> 0.0) bootstrap-sass (~> 3.4) - cloudflare (~> 2.1) + cloudflare (~> 4.3) coffee-rails (~> 4.2) coveralls (~> 0.8) csvlint (~> 1.2)