Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/use_puma'
Browse files Browse the repository at this point in the history
Conflicts:
	Gemfile.lock
  • Loading branch information
carols10cents committed May 27, 2013
2 parents 8bc39a5 + be36790 commit b1848a7
Showing 2 changed files with 6 additions and 17 deletions.
7 changes: 3 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -23,7 +23,6 @@ gem "haml-rails", "~> 0.3.4"
gem 'jquery-rails', "~> 1.0.12"
gem 'airbrake', "~> 3.0.9"
gem 'bcrypt-ruby', "~> 3.0.0"
gem 'thin', "~> 1.5.0"
gem 'omniauth', "~> 1.1.0"
gem "omniauth-twitter", "~> 0.0.12"
gem "mongo_mapper", "~> 0.12.0"
@@ -52,9 +51,9 @@ gem "delayed_job", :git => "git://github.com/collectiveidea/delayed
gem "delayed_job_mongo_mapper", :git => "git://github.com/earbits/delayed_job_mongo_mapper.git"
gem "whenever", "~> 0.6.8"

group :production do
gem 'unicorn', "~> 4.0.1"
end
# web server

gem "puma", "~> 1.6.3"

group :development, :test do
gem "database_cleaner", "~> 0.6.7"
16 changes: 3 additions & 13 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -103,7 +103,6 @@ GEM
draper (0.11.1)
activesupport (>= 2.3.10)
erubis (2.7.0)
eventmachine (1.0.3)
exceptional (2.0.33)
rack
execjs (1.4.0)
@@ -131,7 +130,6 @@ GEM
jquery-rails
railties (>= 3.1.0)
json (1.7.7)
kgio (2.8.0)
launchy (2.0.5)
addressable (~> 2.2.6)
libv8 (3.11.8.13)
@@ -177,6 +175,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.2)
railties (>= 3.1, < 5.0)
@@ -202,7 +202,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
therubyracer (0.11.4)
libv8 (~> 3.11.8.12)
ref
thin (1.5.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.17.0)
tilt (1.3.6)
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)
@@ -313,6 +304,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)
@@ -326,12 +318,10 @@ DEPENDENCIES
show_me_the_cookies (~> 1.1.0)
simplecov (~> 0.4.0)
therubyracer (~> 0.11.3)
thin (~> 1.5.0)
tire (~> 0.4.1)
twitter (~> 4.6.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 b1848a7

Please sign in to comment.