Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ci

gitlabhq · Jan 7, 2015 · 7693bae · 7693bae
2 parents 8c1b530 + 0d0013c
commit 7693bae
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/config/unicorn.rb.example.development b/config/unicorn.rb.example.development
@@ -0,0 +1,2 @@
+worker_processes 2
+timeout 60