diff --git a/Gemfile b/Gemfile index 82282bee..2a2c3f62 100644 --- a/Gemfile +++ b/Gemfile @@ -10,9 +10,9 @@ gem 'oj', '~> 2.0' gem 'parseconfig' gem 'rack' gem 'rake', '~> 10.0' -gem 'sinatra', '~> 1.0' +gem 'sinatra', '~> 3.0' gem 'sinatra-advanced-routes' -gem 'sinatra-contrib', '~> 1.0' +gem 'sinatra-contrib', '~> 3.0' # Rack middleware gem 'ffi' diff --git a/Gemfile.lock b/Gemfile.lock index 93253611..e86a43ec 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -212,8 +212,12 @@ GEM minitest-stub_any_instance (1.0.3) mlanett-redis-lock (0.2.7) redis + monkey-lib (0.4.2) + backports multi_json (1.15.0) multipart-post (2.3.0) + mustermann (3.0.0) + ruby2_keywords (~> 0.0.1) net-http-persistent (2.9.4) net-imap (0.3.4) date @@ -240,18 +244,18 @@ GEM coderay (~> 1.1) method_source (~> 1.0) public_suffix (5.0.1) - rack (1.6.13) + rack (2.2.6.2) rack-accept (0.4.5) rack (>= 0.4) rack-attack (6.6.1) rack (>= 1.0, < 3) rack-cache (1.13.0) rack (>= 0.4) - rack-cors (1.0.6) - rack (>= 1.6.0) + rack-cors (1.1.1) + rack (>= 2.0.0) rack-mini-profiler (3.0.0) rack (>= 1.2.0) - rack-protection (1.5.5) + rack-protection (3.0.5) rack rack-test (2.0.2) rack (>= 1.3) @@ -303,19 +307,24 @@ GEM simplecov (~> 0.19) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - sinatra (1.4.8) - rack (~> 1.5) - rack-protection (~> 1.4) - tilt (>= 1.3, < 3) - sinatra-advanced-routes (0.5.3) - sinatra (~> 1.0) - sinatra-contrib (1.4.7) - backports (>= 2.0) + sinatra (3.0.5) + mustermann (~> 3.0) + rack (~> 2.2, >= 2.2.4) + rack-protection (= 3.0.5) + tilt (~> 2.0) + sinatra-advanced-routes (0.4.1) + monkey-lib (~> 0.4.0) + sinatra (>= 0.9.4) + sinatra-sugar (~> 0.4.0) + sinatra-contrib (3.0.5) multi_json - rack-protection - rack-test - sinatra (~> 1.4.0) - tilt (>= 1.3, < 3) + mustermann (~> 3.0) + rack-protection (= 3.0.5) + sinatra (= 3.0.5) + tilt (~> 2.0) + sinatra-sugar (0.4.1) + monkey-lib (~> 0.4.0) + sinatra (>= 0.9.4) sshkit (1.21.3) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) @@ -388,9 +397,9 @@ DEPENDENCIES shotgun! simplecov simplecov-cobertura - sinatra (~> 1.0) + sinatra (~> 3.0) sinatra-advanced-routes - sinatra-contrib (~> 1.0) + sinatra-contrib (~> 3.0) sparql-client! unicorn unicorn-worker-killer