aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Legler <alex@a3li.li>2015-03-29 22:57:11 +0200
committerAlex Legler <alex@a3li.li>2015-03-29 22:57:11 +0200
commit62a645e767663ea1601797bef9f4b1d743159910 (patch)
treece7b61a5943415110bdfcf2f2b5fb00081e1b313
parentRemove XSL stylesheets (diff)
downloadglsamaker-62a645e767663ea1601797bef9f4b1d743159910.tar.gz
glsamaker-62a645e767663ea1601797bef9f4b1d743159910.tar.bz2
glsamaker-62a645e767663ea1601797bef9f4b1d743159910.zip
Back to thin
-rw-r--r--Gemfile4
-rw-r--r--Gemfile.lock14
2 files changed, 9 insertions, 9 deletions
diff --git a/Gemfile b/Gemfile
index b93224b..ed4660a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,8 +20,8 @@ gem 'json'
gem 'prototype-rails'
# Use unicorn as the web server
-gem 'unicorn'
-# gem 'thin'
+#gem 'unicorn'
+gem 'thin'
# Deploy with Capistrano
gem 'capistrano'
diff --git a/Gemfile.lock b/Gemfile.lock
index f569636..cc32711 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -37,10 +37,12 @@ GEM
net-ssh-gateway (>= 1.1.0)
ci_reporter (1.9.0)
builder (>= 2.1.2)
+ daemons (1.2.2)
diff-lcs (1.2.4)
domain_name (0.5.13)
unf (>= 0.0.5, < 1.0.0)
erubis (2.7.0)
+ eventmachine (1.0.7)
fastercsv (1.5.5)
hashie (2.0.5)
highline (1.6.19)
@@ -50,7 +52,6 @@ GEM
i18n (0.6.5)
innertube (1.1.0)
json (1.8.0)
- kgio (2.9.2)
kramdown (1.2.0)
mail (2.5.4)
mime-types (~> 1.16)
@@ -109,7 +110,6 @@ GEM
activesupport (= 4.0.0)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
- raindrops (0.13.0)
rake (10.1.0)
riddle (1.5.8)
rspec (2.14.1)
@@ -135,6 +135,10 @@ GEM
activesupport (>= 3.0)
sprockets (~> 2.8)
text-format (1.0.0)
+ thin (1.6.3)
+ daemons (~> 1.0, >= 1.0.9)
+ eventmachine (~> 1.0)
+ rack (~> 1.0)
thinking-sphinx (3.0.5)
activerecord (>= 3.1.0)
builder (>= 2.1.2)
@@ -152,10 +156,6 @@ GEM
unf (0.1.2)
unf_ext
unf_ext (0.0.6)
- unicorn (4.8.3)
- kgio (~> 2.6)
- rack
- raindrops (~> 0.7)
webrobots (0.1.1)
PLATFORMS
@@ -178,5 +178,5 @@ DEPENDENCIES
runspell
simplecov
text-format
+ thin
thinking-sphinx (~> 3.0.2)
- unicorn