1
0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-29 18:50:08 +03:00

Merge pull request #377 from vholer/bug-5215

Use rack < 2.0 for current systems
This commit is contained in:
Javi Fontan 2017-07-06 22:33:56 +02:00 committed by GitHub
commit 5d33ada82b
3 changed files with 15 additions and 19 deletions

View File

@ -42,7 +42,6 @@ GEM
mime-types (2.99.3)
mini_portile2 (2.2.0)
multipart-post (2.0.0)
mustermann (1.0.0)
mysql2 (0.4.6)
net-ldap (0.12.1)
nokogiri (1.8.0)
@ -51,16 +50,15 @@ GEM
parse-cron (0.1.4)
polyglot (0.3.5)
public_suffix (2.0.5)
rack (2.0.3)
rack-protection (2.0.0)
rack (1.6.8)
rack-protection (1.5.3)
rack
scrub_rb (1.0.1)
sequel (4.47.0)
sinatra (2.0.0)
mustermann (~> 1.0)
rack (~> 2.0)
rack-protection (= 2.0.0)
tilt (~> 2.0)
sinatra (1.4.8)
rack (~> 1.5)
rack-protection (~> 1.4)
tilt (>= 1.3, < 3)
sqlite3 (1.3.13)
systemu (2.6.5)
thin (1.7.1)
@ -98,7 +96,7 @@ DEPENDENCIES
nokogiri
ox
parse-cron
rack
rack (< 2.0.0)
sequel
sinatra
sqlite3

View File

@ -10,7 +10,7 @@ else
gem 'zendesk_api', '< 1.14.0'
end
if RUBY_VERSION < '2.2.0'
if RUBY_VERSION < '2.4.0'
gem 'rack', '< 2.0.0'
else
gem 'rack'

View File

@ -42,7 +42,6 @@ GEM
mime-types (2.99.3)
mini_portile2 (2.2.0)
multipart-post (2.0.0)
mustermann (1.0.0)
mysql2 (0.4.6)
net-ldap (0.12.1)
nokogiri (1.8.0)
@ -51,16 +50,15 @@ GEM
parse-cron (0.1.4)
polyglot (0.3.5)
public_suffix (2.0.5)
rack (2.0.3)
rack-protection (2.0.0)
rack (1.6.8)
rack-protection (1.5.3)
rack
scrub_rb (1.0.1)
sequel (4.47.0)
sinatra (2.0.0)
mustermann (~> 1.0)
rack (~> 2.0)
rack-protection (= 2.0.0)
tilt (~> 2.0)
sinatra (1.4.8)
rack (~> 1.5)
rack-protection (~> 1.4)
tilt (>= 1.3, < 3)
sqlite3 (1.3.13)
systemu (2.6.5)
thin (1.7.1)
@ -98,7 +96,7 @@ DEPENDENCIES
nokogiri
ox
parse-cron
rack
rack (< 2.0.0)
sequel
sinatra
sqlite3