summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-04-08 11:19:37 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-04-08 11:19:37 +0000
commitc945ca3ad17d67da93afccc51461c9a07d702f19 (patch)
treee32ab0a9f58c23b6c586a29ffb536de03559012c
parent665a69941bed38139c38d1142e7dec2c6cd1b517 (diff)
parent4df1a10e906d308089343ea400f5c510a9f0e90c (diff)
downloadgitlab-ce-c945ca3ad17d67da93afccc51461c9a07d702f19.tar.gz
Merge branch 'update_development_details' into 'master'
Update development steps
-rw-r--r--README.md4
-rw-r--r--config/unicorn.rb.example.development (renamed from config/unicorn_development.rb)0
2 files changed, 4 insertions, 0 deletions
diff --git a/README.md b/README.md
index fcc40f1b917..374f4aee8f3 100644
--- a/README.md
+++ b/README.md
@@ -85,6 +85,10 @@ or by directly calling the script
### Run in development mode
+Copy the example development unicorn configuration file
+
+ cp config/unicorn.rb.example.development config/unicorn.rb
+
Start it with [Foreman](https://github.com/ddollar/foreman)
bundle exec foreman start -p 3000
diff --git a/config/unicorn_development.rb b/config/unicorn.rb.example.development
index 94a7061451d..94a7061451d 100644
--- a/config/unicorn_development.rb
+++ b/config/unicorn.rb.example.development