Update sinatra dependency to version 1.3.3

sferik · Sep 13, 2012 · 53ad1e7 · 53ad1e7
1 parent 1fc2e81
commit 53ad1e7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,6 @@
 source :rubygems
 
-gem 'sinatra', '1.1.2'
+gem 'sinatra', '~> 1.1'
 gem 'activesupport'
 gem 'geoip'
 gem 'i18n'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -16,15 +16,18 @@ GEM
     multi_json (1.3.6)
     newrelic_rpm (3.4.2.1)
     rack (1.4.1)
+    rack-protection (1.2.0)
+      rack
     rack-test (0.6.1)
       rack (>= 1.0)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
     shoulda (2.0.6)
-    sinatra (1.1.2)
-      rack (~> 1.1)
-      tilt (~> 1.2)
+    sinatra (1.3.3)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
+      tilt (~> 1.3, >= 1.3.3)
     tilt (1.3.3)
 
 PLATFORMS
@@ -39,4 +42,4 @@ DEPENDENCIES
   rack-test
   rake
   shoulda
-  sinatra (= 1.1.2)
+  sinatra (~> 1.1)