Merge branch 'increase-unicorn-memory-killer-limits' into 'master'

Increase the memory limits used in the unicorn killer

Closes gitlab-com/infrastructure#19

See merge request gitlab-org/gitlab-ce!17948

changelogs/unreleased/increase-unicorn-memory-killer-limits.yml

+---
+title: Increase the memory limits used in the unicorn killer
+merge_request: 17948
+author:
+type: other

config.ru

@@ -7,8 +7,8 @@ if defined?(Unicorn)
     # Unicorn self-process killer
     require 'unicorn/worker_killer'
 
-    min = (ENV['GITLAB_UNICORN_MEMORY_MIN'] || 300 * 1 << 20).to_i
-    max = (ENV['GITLAB_UNICORN_MEMORY_MAX'] || 350 * 1 << 20).to_i
+    min = (ENV['GITLAB_UNICORN_MEMORY_MIN'] || 400 * 1 << 20).to_i
+    max = (ENV['GITLAB_UNICORN_MEMORY_MAX'] || 650 * 1 << 20).to_i
 
     # Max memory size (RSS) per worker
     use Unicorn::WorkerKiller::Oom, min, max