Commit a02678cb62704316c79c9b8142763ae17598638d
Exists in
master
and in
4 other branches
Merge branch 'coherent-and-readable-starting-instructions' of /home/git/repositories/gitlab/gitlabhq
Showing
1 changed file
with
9 additions
and
7 deletions
Show diff stats
README.md
| @@ -85,26 +85,28 @@ Each month on the 22th a new version is released together with an upgrade guide. | @@ -85,26 +85,28 @@ Each month on the 22th a new version is released together with an upgrade guide. | ||
| 85 | * Features that will be in the next release are listed on [the feedback and suggestions forum with the status "started"](http://feedback.gitlab.com/forums/176466-general/status/796456). | 85 | * Features that will be in the next release are listed on [the feedback and suggestions forum with the status "started"](http://feedback.gitlab.com/forums/176466-general/status/796456). |
| 86 | 86 | ||
| 87 | 87 | ||
| 88 | -### Getting started | 88 | +### Run in production mode |
| 89 | 89 | ||
| 90 | -1. The Installation guide contains instructions to download an init script and run that on boot. With the init script you can also start GitLab | 90 | +1. The Installation guide contains instructions on how to download an init script and run it automatically on boot. You can also start the init script manually: |
| 91 | 91 | ||
| 92 | sudo service gitlab start | 92 | sudo service gitlab start |
| 93 | 93 | ||
| 94 | - or | 94 | + or by directly calling the script |
| 95 | 95 | ||
| 96 | - sudo /etc/init.d/gitlab restart | 96 | + sudo /etc/init.d/gitlab start |
| 97 | 97 | ||
| 98 | -2. Start it with [Foreman](https://github.com/ddollar/foreman) in development mode | 98 | +### Run in development mode |
| 99 | + | ||
| 100 | +Start it with [Foreman](https://github.com/ddollar/foreman) | ||
| 99 | 101 | ||
| 100 | bundle exec foreman start -p 3000 | 102 | bundle exec foreman start -p 3000 |
| 101 | 103 | ||
| 102 | - or start it manually | 104 | + or start each component separately |
| 103 | 105 | ||
| 104 | bundle exec rails s | 106 | bundle exec rails s |
| 105 | bundle exec rake sidekiq:start | 107 | bundle exec rake sidekiq:start |
| 106 | 108 | ||
| 107 | -### Running the tests | 109 | +### Run the tests |
| 108 | 110 | ||
| 109 | * Seed the database | 111 | * Seed the database |
| 110 | 112 |