summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-01-23 23:56:02 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-01-23 23:56:02 -0800
commit2adbc0b778985ee6b0a78b5acd845904520ccc64 (patch)
treeda9b9a348c1c693831a0fe0338fb1b8356b16b62
parentcb9f1a4fe73e11fe2250800e06e4c288818629d7 (diff)
parentbe150fa9913d760802dc4c673ed59930f03ffec0 (diff)
downloadgitlab-ce-2adbc0b778985ee6b0a78b5acd845904520ccc64.tar.gz
Merge pull request #6142 from gdamjan/master
Check specifically for Unicorn in rack config.ru file
-rw-r--r--config.ru2
1 files changed, 1 insertions, 1 deletions
diff --git a/config.ru b/config.ru
index c45449dd03f..e90863a5c21 100644
--- a/config.ru
+++ b/config.ru
@@ -1,6 +1,6 @@
# This file is used by Rack-based servers to start the application.
-unless defined?(PhusionPassenger)
+if defined?(Unicorn)
require 'unicorn'
# Unicorn self-process killer
require 'unicorn/worker_killer'