Skip to content
Browse files

update bundle

  • Loading branch information...
1 parent d116e68 commit 38738b79ab414f54cc1777cf12d0223caafef480 @rkh committed Mar 16, 2013
Showing with 32 additions and 30 deletions.
  1. +3 −2 .travis.yml
  2. +29 −28 Gemfile.lock
View
5 .travis.yml
@@ -11,10 +11,11 @@ rvm:
- rbx-18mode
- rbx-19mode
env:
-- rack=1.3.0
+- rack=1.5.2
- rack=master
-- tilt=1.3.2
+- tilt=1.3.4
- tilt=master
+- sinatra=1.4.1
- sinatra=master
matrix:
allow_failures:
View
57 Gemfile.lock
@@ -1,11 +1,11 @@
GIT
remote: git://github.com/sinatra/sinatra
- revision: b882ab37df7d0a850d6e2091507dbc66d1ae2ea0
+ revision: 9567316944fd03489b93f4e8a4072a2e4932e007
specs:
- sinatra (1.4.0)
- rack (~> 1.3, >= 1.3.6)
- rack-protection (~> 1.2)
- tilt (~> 1.3, >= 1.3.3)
+ sinatra (1.4.1)
+ rack (~> 1.5, >= 1.5.2)
+ rack-protection (~> 1.4)
+ tilt (~> 1.3, >= 1.3.4)
PATH
remote: .
@@ -21,32 +21,33 @@ PATH
GEM
remote: http://rubygems.org/
specs:
- backports (2.3.0)
- diff-lcs (1.1.3)
+ backports (3.1.1)
+ diff-lcs (1.2.1)
erubis (2.7.0)
- eventmachine (0.12.10)
- haml (3.1.4)
- json (1.6.5)
- multi_json (1.6.0)
- rack (1.4.1)
- rack-protection (1.2.0)
+ eventmachine (1.0.3)
+ haml (4.0.0)
+ tilt
+ json (1.7.7)
+ multi_json (1.6.1)
+ rack (1.5.2)
+ rack-protection (1.5.0)
rack
- rack-test (0.6.1)
+ rack-test (0.6.2)
rack (>= 1.0)
- rake (0.9.2.2)
- rspec (2.9.0)
- rspec-core (~> 2.9.0)
- rspec-expectations (~> 2.9.0)
- rspec-mocks (~> 2.9.0)
- rspec-core (2.9.0)
- rspec-expectations (2.9.0)
- diff-lcs (~> 1.1.3)
- rspec-mocks (2.9.0)
- slim (1.1.1)
- temple (~> 0.4.0)
- tilt (~> 1.3.2)
- temple (0.4.0)
- tilt (1.3.3)
+ rake (10.0.3)
+ rspec (2.13.0)
+ rspec-core (~> 2.13.0)
+ rspec-expectations (~> 2.13.0)
+ rspec-mocks (~> 2.13.0)
+ rspec-core (2.13.1)
+ rspec-expectations (2.13.0)
+ diff-lcs (>= 1.1.3, < 2.0)
+ rspec-mocks (2.13.0)
+ slim (1.3.6)
+ temple (~> 0.5.5)
+ tilt (~> 1.3.3)
+ temple (0.5.5)
+ tilt (1.3.5)
yajl-ruby (1.1.0)
PLATFORMS

0 comments on commit 38738b7

Please sign in to comment.
Something went wrong with that request. Please try again.