summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-07-05 13:26:30 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-07-05 13:26:30 +0300
commit727c5b17590babdef14b7ecd3cf4f06a6e5279e4 (patch)
tree6d2bf7968f6187e15bd18915a7bc912588577706 /README.md
parentd787a55714fa53a0ff096619f0219dd13f9eb281 (diff)
downloadgitlab-ci-727c5b17590babdef14b7ecd3cf4f06a6e5279e4.tar.gz
Improving docs for 3.0
Diffstat (limited to 'README.md')
-rw-r--r--README.md9
1 files changed, 5 insertions, 4 deletions
diff --git a/README.md b/README.md
index 2b708fc..86adc8a 100644
--- a/README.md
+++ b/README.md
@@ -21,10 +21,9 @@ Additionally GitLab CI requires:
* ruby 1.9.3
* MySQL or PostgreSQL
-__We recommend to use a server with at least 756MB RAM for a gitlab-ci instance.__
-
-__The master branch contains the unstable 3.0. Please use the 2-2-stable branch__
+This version (3.x) is designed for GitLab 5.3+.
+If you want to use GitLab CI without GitLab or with older versions you need to use [2-2-stable](https://github.com/gitlabhq/gitlab-ci/tree/2-2-stable#gitlab-ci-is-an-open-source-continuous-integration-server)
### How it works
@@ -45,9 +44,11 @@ Possible Cases:
* 1 __GitLab CI__ and N __GitLab CI Runner__ instances on local machines
+![screen](https://raw.github.com/gitlabhq/gitlab-ci/master/app/assets/images/arch.jpg)
+
### Installation
-* [Installation and setup guide for v2.2](https://github.com/gitlabhq/gitlab-ci/blob/2-2-stable/doc/installation.md)
+* [Installation and setup guide](https://github.com/gitlabhq/gitlab-ci/blob/master/doc/installation.md)
### Getting help