aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Longair <mhl@pobox.com>2013-09-17 17:31:57 +0100
committerMark Longair <mhl@pobox.com>2013-10-29 13:45:26 +0000
commitefb76eacd59bce5e356f0021f6f672244edd070b (patch)
tree5d5738a795fcb0daf9ec1a758a32810f6563a661
parent20be3ca29859d7566cf5f5dfc012aa8a5f02492b (diff)
Add the Thin web server to the Gemfile
Thin is a reasonable choice for a production server for a Rails app behind nginx, which is the configuration that the Alaveteli install script will use. Thin is also the preferred server for local development in Rails 3.2 and later.
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock1
2 files changed, 2 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index 04fa16eba..59867b444 100644
--- a/Gemfile
+++ b/Gemfile
@@ -33,6 +33,7 @@ gem 'rmagick', :require => 'RMagick'
gem 'ruby-msg', '~> 1.5.0'
gem "statistics2", "~> 0.54"
gem 'syslog_protocol'
+gem 'thin'
gem 'vpim'
gem 'will_paginate'
# when 1.2.9 is released by the maintainer, we can stop using this fork:
diff --git a/Gemfile.lock b/Gemfile.lock
index 4494c2342..db4b4d273 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -292,6 +292,7 @@ DEPENDENCIES
spork-rails
statistics2 (~> 0.54)
syslog_protocol
+ thin
unicode
unidecode
vpim