diff options
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index d5d830f..8a4017f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,7 +2,7 @@ GEM remote: https://rubygems.org/ specs: RedCloth (4.2.9) - addressable (2.3.7) + addressable (2.3.8) bcrypt-ruby (3.0.1) crack (0.4.2) safe_yaml (~> 1.0.0) @@ -61,7 +61,7 @@ GEM do_sqlite3 (0.10.15) data_objects (= 0.10.15) docile (1.1.5) - eventmachine (0.12.10) + eventmachine (1.0.7) fastercsv (1.5.5) haml (3.0.15) ipaddress (0.8.0) @@ -72,10 +72,12 @@ GEM log4r (1.0.6) multi_json (1.0.4) nokogiri (1.5.11) - rack (1.3.4) - rack-protection (1.1.4) + rack (1.6.0) + rack-flash3 (1.0.5) rack - rack-test (0.6.1) + rack-protection (1.5.3) + rack + rack-test (0.6.3) rack (>= 1.0) rmail (1.1.0) ruby_protobuf (0.4.11) @@ -87,16 +89,16 @@ GEM multi_json (~> 1.0) simplecov-html (~> 0.9.0) simplecov-html (0.9.0) - sinatra (1.3.1) - rack (~> 1.3, >= 1.3.4) - rack-protection (~> 1.1, >= 1.1.2) - tilt (~> 1.3, >= 1.3.3) + sinatra (1.4.6) + rack (~> 1.4) + rack-protection (~> 1.4) + tilt (>= 1.3, < 3) spruz (0.2.13) stringex (1.3.3) - thin (1.2.4) - daemons (>= 1.0.9) - eventmachine (>= 0.12.6) - rack (>= 1.0.0) + thin (1.6.3) + daemons (~> 1.0, >= 1.0.9) + eventmachine (~> 1.0) + rack (~> 1.0) tilt (1.3.3) timecop (0.3.5) uuidtools (2.1.5) @@ -120,21 +122,21 @@ DEPENDENCIES dm-transactions (= 1.2.0) dm-types (= 1.2.0) dm-validations (= 1.2.0) - eventmachine (= 0.12.10) haml (= 3.0.15) ipaddress (= 0.8.0) json (= 1.5.4) locale (= 2.1.0) log4r (= 1.0.6) - rack (= 1.3.4) - rack-protection (= 1.1.4) - rack-test (= 0.6.1) + rack + rack-flash3 + rack-protection + rack-test rmail (= 1.1.0) ruby_protobuf (= 0.4.11) sanitize (= 2.0.3) simplecov - sinatra (= 1.3.1) - thin (= 1.2.4) + sinatra (= 1.4.6) + thin (= 1.6.3) tilt (= 1.3.3) timecop (= 0.3.5) webmock (= 1.7.6) |