summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
Diffstat (limited to 'README.md')
-rw-r--r--README.md13
1 files changed, 7 insertions, 6 deletions
diff --git a/README.md b/README.md
index d6b959ba54f..7bff30b35e8 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@
### Resources
-* [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/).
+* [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/).
* [GitLab Enterprise Edition](https://www.gitlab.com/gitlab-ee/) offers additional features aimed at larger organizations.
@@ -40,7 +40,7 @@
### Requirements
* Ubuntu/Debian/CentOS/RHEL**
-* ruby 1.9.3+
+* ruby 2.0+
* git 1.7.10+
* redis 2.0+
* MySQL or PostgreSQL
@@ -71,14 +71,15 @@ or by directly calling the script
Please login with root / 5iveL!fe
-### Run in development mode
-
-Consider setting up the development environment with [the cookbook](https://gitlab.com/gitlab-org/cookbook-gitlab/blob/master/README.md#installation).
+### Install a development environment
-Copy the example development unicorn configuration file
+We recommend setting up your development environment with [the cookbook](https://gitlab.com/gitlab-org/cookbook-gitlab/blob/master/README.md#installation).
+If you do not use the cookbook you might need to copy the example development unicorn configuration file
cp config/unicorn.rb.example.development config/unicorn.rb
+### Run in development mode
+
Start it with [Foreman](https://github.com/ddollar/foreman)
bundle exec foreman start -p 3000