Commit e0b430ad13b05fc447091cd0226148e370b50685
Exists in
spb-stable
and in
2 other branches
Merge branch 'clearify-the-development-install' into 'master'
Clearify the development install Discussed this with @marin, he agrees.
Showing
1 changed file
with
6 additions
and
5 deletions
Show diff stats
README.md
| ... | ... | @@ -29,7 +29,7 @@ |
| 29 | 29 | |
| 30 | 30 | ### Resources |
| 31 | 31 | |
| 32 | -* [GitLab.com](https://www.gitlab.com/) includes information about [subscriptions](https://www.gitlab.com/subscription/), [consultancy](https://www.gitlab.com/consultancy/), the [community](https://www.gitlab.com/community/) and the [hosted GitLab Cloud](https://www.gitlab.com/cloud/). | |
| 32 | +* [www.gitlab.com](https://www.gitlab.com/) includes information about [subscriptions](https://www.gitlab.com/subscription/), [consultancy](https://www.gitlab.com/consultancy/), the [community](https://www.gitlab.com/community/) and the [hosted GitLab.com](https://www.gitlab.com/gitlab-com/). | |
| 33 | 33 | |
| 34 | 34 | * [GitLab Enterprise Edition](https://www.gitlab.com/gitlab-ee/) offers additional features aimed at larger organizations. |
| 35 | 35 | |
| ... | ... | @@ -71,14 +71,15 @@ or by directly calling the script |
| 71 | 71 | |
| 72 | 72 | Please login with root / 5iveL!fe |
| 73 | 73 | |
| 74 | -### Run in development mode | |
| 75 | - | |
| 76 | -Consider setting up the development environment with [the cookbook](https://gitlab.com/gitlab-org/cookbook-gitlab/blob/master/README.md#installation). | |
| 74 | +### Install a development environment | |
| 77 | 75 | |
| 78 | -Copy the example development unicorn configuration file | |
| 76 | +We recommend setting up your development environment with [the cookbook](https://gitlab.com/gitlab-org/cookbook-gitlab/blob/master/README.md#installation). | |
| 77 | +If you do not use the cookbook you might need to copy the example development unicorn configuration file | |
| 79 | 78 | |
| 80 | 79 | cp config/unicorn.rb.example.development config/unicorn.rb |
| 81 | 80 | |
| 81 | +### Run in development mode | |
| 82 | + | |
| 82 | 83 | Start it with [Foreman](https://github.com/ddollar/foreman) |
| 83 | 84 | |
| 84 | 85 | bundle exec foreman start -p 3000 | ... | ... |