Merge branch '6-4-stable' of dev.gitlab.org:gitlab/gitlabhq into 6-4-3-ce

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION

CHANGELOG

+v6.4.2
+  - Fixed wrong behaviour of script/upgrade.rb
+
+v6.4.1 
+  - Fixed bug with repository rename
+  - Fixed bug with project transfer
+
 v 6.4.0
   - Added sorting to project issues page (Jason Blanchard)
   - Assembla integration (Carlos Paramio)

config.ru

 # This file is used by Rack-based servers to start the application.
 
-# Unicorn self-process killer
-require 'unicorn/worker_killer'
+unless defined?(PhusionPassenger)
+  # Unicorn self-process killer
+  require 'unicorn/worker_killer'
 
-# # Max memory size (RSS) per worker
-use Unicorn::WorkerKiller::Oom, (200 * (1 << 20)), (250 * (1 << 20))
+  # Max memory size (RSS) per worker
+  use Unicorn::WorkerKiller::Oom, (200 * (1 << 20)), (250 * (1 << 20))
+end
 
 require ::File.expand_path('../config/environment',  __FILE__)