diff options
| author | Michel Etienne | 2014-09-11 13:55:04 +0200 |
|---|---|---|
| committer | Michel Etienne | 2014-09-11 13:55:04 +0200 |
| commit | 76b7562ba2710a495dfe0700cca90ed70eee8bef (patch) | |
| tree | 45037c36c9b83fb40758eb9c4a24051506993651 | |
| parent | f7c74269723c8920044def1617516f53a5393eb1 (diff) | |
| download | chouette-core-76b7562ba2710a495dfe0700cca90ed70eee8bef.tar.bz2 | |
update warbler for rubyzip
| -rw-r--r-- | Gemfile.lock | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index afd4e21dc..5f2596da1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -184,10 +184,10 @@ GEM jquery-rails jquery-ui-rails (= 4.0.3) railties (>= 3.1.0) - jruby-jars (1.6.7.2) + jruby-jars (1.7.15) jruby-openssl (0.7.7) bouncy-castle-java (>= 1.5.0146.1) - jruby-rack (1.1.9) + jruby-rack (1.1.16) jruby-rack-worker (0.4-java) jruby-rack (>= 1.1.1) json (1.8.1) @@ -347,11 +347,11 @@ GEM uglifier (1.2.7) execjs (>= 0.3.0) multi_json (~> 1.3) - warbler (1.3.6) - jruby-jars (>= 1.4.0) + warbler (1.4.4) + jruby-jars (>= 1.5.6, < 2.0) jruby-rack (>= 1.0.0) - rake (>= 0.8.7) - rubyzip (>= 0.9.4) + rake (>= 0.9.6) + rubyzip (>= 0.9, < 1.2) warden (1.2.1) rack (>= 1.0) websocket (1.2.1) |