summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-01-14 20:21:04 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-01-14 20:21:04 +0200
commite98d4780850e8649718f10c2a4d5b3dc7f04b390 (patch)
tree6474a66d8ed3d937d2559b6ccf44719ec33fc3d3
parentb6da734824d0c74ef5bb4b784d404144c76d75f4 (diff)
downloadgitlab-ce-e98d4780850e8649718f10c2a4d5b3dc7f04b390.tar.gz
remove thin from production env. Use unicorn for foreman
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock6
-rw-r--r--Procfile2
3 files changed, 1 insertions, 8 deletions
diff --git a/Gemfile b/Gemfile
index 20323f2e3e4..87f45e59c69 100644
--- a/Gemfile
+++ b/Gemfile
@@ -71,7 +71,6 @@ gem "redcarpet", "~> 2.2.2"
gem "github-markup", "~> 0.7.4", require: 'github/markup'
# Servers
-gem "thin", '~> 1.5.0'
gem "unicorn", "~> 4.4.0"
# Issue tags
diff --git a/Gemfile.lock b/Gemfile.lock
index 58d510634e9..666f0d081d7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -144,7 +144,6 @@ GEM
colorize (0.5.8)
connection_pool (1.0.0)
crack (0.3.1)
- daemons (1.1.9)
devise (2.1.2)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1)
@@ -437,10 +436,6 @@ GEM
test_after_commit (0.0.1)
therubyracer (0.10.2)
libv8 (~> 3.3.10)
- thin (1.5.0)
- daemons (>= 1.0.9)
- eventmachine (>= 0.12.6)
- rack (>= 1.0.0)
thor (0.16.0)
tilt (1.3.3)
timers (1.0.2)
@@ -547,7 +542,6 @@ DEPENDENCIES
stamp
test_after_commit
therubyracer
- thin (~> 1.5.0)
uglifier (~> 1.3.0)
unicorn (~> 4.4.0)
webmock
diff --git a/Procfile b/Procfile
index d3b3e051e88..21dfade1d8a 100644
--- a/Procfile
+++ b/Procfile
@@ -1,2 +1,2 @@
-web: bundle exec rails s -p $PORT
+web: bundle exec unicorn_rails -p $PORT
worker: bundle exec sidekiq -q post_receive,mailer,system_hook,common,default