diff options
| author |   Alex Legler <alex@a3li.li> | 2014-06-13 18:59:32 +0200 |
|---|---|---|
| committer | Alex Legler <alex@a3li.li> | 2014-06-13 18:59:32 +0200 |
| commit | 232417df2c982f00a55851490a32b0c8dbaab679 (patch) | |
| tree | dd62ee3b0cc2696048e90599d11083812b96e7cf | |
| parent | Don't overescape template contents (diff) | |
| download | glsamaker-232417df2c982f00a55851490a32b0c8dbaab679.tar.gz glsamaker-232417df2c982f00a55851490a32b0c8dbaab679.tar.bz2 glsamaker-232417df2c982f00a55851490a32b0c8dbaab679.zip | |
Switch to unicorn for interim deployment
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 14 |
2 files changed, 9 insertions, 9 deletions
@@ -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 4b25d72..f569636 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -37,12 +37,10 @@ GEM net-ssh-gateway (>= 1.1.0) ci_reporter (1.9.0) builder (>= 2.1.2) - daemons (1.1.9) diff-lcs (1.2.4) domain_name (0.5.13) unf (>= 0.0.5, < 1.0.0) erubis (2.7.0) - eventmachine (1.0.3) fastercsv (1.5.5) hashie (2.0.5) highline (1.6.19) @@ -52,6 +50,7 @@ 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) @@ -110,6 +109,7 @@ 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,10 +135,6 @@ GEM activesupport (>= 3.0) sprockets (~> 2.8) text-format (1.0.0) - thin (1.6.0) - daemons (>= 1.0.9) - eventmachine (>= 1.0.0) - rack (>= 1.5.0) thinking-sphinx (3.0.5) activerecord (>= 3.1.0) builder (>= 2.1.2) @@ -156,6 +152,10 @@ 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 |