summaryrefslogtreecommitdiff
path: root/Procfile
diff options
context:
space:
mode:
authordosire <sytses@gmail.com>2014-03-25 20:57:21 +0100
committerdosire <sytses@gmail.com>2014-03-25 20:57:21 +0100
commitb2e74741555f9cb9d58c3c44810803d0db39b9f3 (patch)
tree413fa17b0afa673c08e88e96217fe459265e835a /Procfile
parent775f686e0e6e126555910a32c5c400d24e90789e (diff)
parent7f67e066dc9749d2532d220fafa3f397a5fe1f24 (diff)
downloadgitlab-ce-b2e74741555f9cb9d58c3c44810803d0db39b9f3.tar.gz
Merge branch 'master' into define-feature-request
Conflicts: PROCESS.md
Diffstat (limited to 'Procfile')
-rw-r--r--Procfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Procfile b/Procfile
index 9003369c938..18df7e78f9b 100644
--- a/Procfile
+++ b/Procfile
@@ -1,2 +1,2 @@
-web: bundle exec unicorn_rails -p $PORT -E development
+web: bundle exec unicorn_rails -p $PORT -E development -c config/unicorn_development.rb
worker: bundle exec sidekiq -q post_receive,mailer,system_hook,project_web_hook,common,default,gitlab_shell