Skip to content
Browse files

Specify a version for puma and bundle

  • Loading branch information...
1 parent 8fd92e5 commit be3679021fb5ef439e5d9942493f065d5a942810 @carols10cents carols10cents committed Feb 18, 2013
Showing with 4 additions and 14 deletions.
  1. +1 −1 Gemfile
  2. +3 −13 Gemfile.lock
View
2 Gemfile
@@ -48,7 +48,7 @@ gem "whenever", "~> 0.6.8"
# web server
-gem "puma"
+gem "puma", "~> 1.6.3"
group :development, :test do
gem "database_cleaner", "~> 0.6.7"
View
16 Gemfile.lock
@@ -103,7 +103,6 @@ GEM
draper (0.11.1)
activesupport (>= 2.3.10)
erubis (2.7.0)
- eventmachine (1.0.0)
exceptional (2.0.32)
rack
execjs (1.4.0)
@@ -131,7 +130,6 @@ GEM
jquery-rails
railties (>= 3.1.0)
json (1.7.7)
- kgio (2.7.4)
launchy (2.0.5)
addressable (~> 2.2.6)
libv8 (3.3.10.4)
@@ -179,6 +177,8 @@ GEM
polyglot (0.3.3)
pony (1.4)
mail (> 2.0)
+ puma (1.6.3)
+ rack (~> 1.2)
pygmentize (0.0.3)
quiet_assets (1.0.1)
railties (~> 3.1)
@@ -204,7 +204,6 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
- raindrops (0.10.0)
rake (10.0.3)
ratom (0.7.2)
libxml-ruby (~> 2.3.2)
@@ -240,10 +239,6 @@ GEM
tilt (~> 1.1, != 1.3.0)
therubyracer (0.9.10)
libv8 (~> 3.3.10)
- thin (1.5.0)
- daemons (>= 1.0.9)
- eventmachine (>= 0.12.6)
- rack (>= 1.0.0)
thor (0.17.0)
tilt (1.3.3)
tire (0.4.3)
@@ -263,10 +258,6 @@ GEM
uglifier (1.0.4)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
- unicorn (4.0.1)
- kgio (~> 2.4)
- rack
- raindrops (~> 0.6)
vcr (1.10.3)
webmock (1.6.4)
addressable (~> 2.2, > 2.2.5)
@@ -312,6 +303,7 @@ DEPENDENCIES
ostatus (~> 0.0.12)
osub (~> 0.0.6)
pony (~> 1.3)
+ puma (~> 1.6.3)
pygmentize (~> 0.0.3)
quiet_assets (~> 1.0.0)
rails (= 3.2.12)
@@ -325,12 +317,10 @@ DEPENDENCIES
show_me_the_cookies (~> 1.1.0)
simplecov (~> 0.4.0)
therubyracer (~> 0.9.9)
- thin (~> 1.5.0)
tire (~> 0.4.1)
twitter (~> 3.5.0)
tzinfo (~> 0.3.29)
uglifier (~> 1.0.0)
- unicorn (~> 4.0.1)
vcr (~> 1.10.3)
webmock (~> 1.6.4)
whenever (~> 0.6.8)

0 comments on commit be36790

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