summaryrefslogtreecommitdiff
path: root/doc/README.md
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2015-09-16 11:57:40 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2015-09-16 11:57:40 +0000
commitcccd269da3f5d82c5d14289980d9b52c9cad08db (patch)
tree2947658dfff44a3873f7d350f0353dbdb7b9b541 /doc/README.md
parent7d59ba00b9aa1a8be28f1b7ccaa1c628be90aabb (diff)
parentac8d2eb065e9522679d4eae4649c6815daa5460c (diff)
downloadgitlab-ce-cccd269da3f5d82c5d14289980d9b52c9cad08db.tar.gz
Merge branch 'ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g' into 'master'
Merge CI into CE First step of #2164. - [x] Merge latest CE master - [x] Make application start - [x] Re-use gitlab sessions (remove CI oauth part) - [x] Get rid of gitlab_ci.yml config - [x] Make tests start - [x] Make most CI features works - [x] Make tests green - [x] Write migration documentation - [x] Add CI builds to CE backup See merge request !1204
Diffstat (limited to 'doc/README.md')
-rw-r--r--doc/README.md23
1 files changed, 23 insertions, 0 deletions
diff --git a/doc/README.md b/doc/README.md
index 337c4e6a62d..f5f1f56b1e2 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -15,6 +15,23 @@
- [Web hooks](web_hooks/web_hooks.md) Let GitLab notify you when new code has been pushed to your project.
- [Workflow](workflow/README.md) Using GitLab functionality and importing projects from GitHub and SVN.
+## CI Documentation
+
++ [Quick Start](ci/quick_start/README.md)
++ [Configuring project (.gitlab-ci.yml)](ci/yaml/README.md)
++ [Configuring runner](ci/runners/README.md)
++ [Configuring deployment](ci/deployment/README.md)
++ [Using Docker Images](ci/docker/using_docker_images.md)
++ [Using Docker Build](ci/docker/using_docker_build.md)
++ [Using Variables](ci/variables/README.md)
+
+### CI Examples
+
++ [Test and deploy Ruby applications to Heroku](ci/examples/test-and-deploy-ruby-application-to-heroku.md)
++ [Test and deploy Python applications to Heroku](ci/examples/test-and-deploy-python-application-to-heroku.md)
++ [Test Clojure applications](ci/examples/test-clojure-application.md)
++ Help your favorite programming language and GitLab by sending a merge request with a guide for that language.
+
## Administrator documentation
- [Custom git hooks](hooks/custom_hooks.md) Custom git hooks (on the filesystem) for when web hooks aren't enough.
@@ -30,6 +47,12 @@
- [Update](update/README.md) Update guides to upgrade your installation.
- [Welcome message](customization/welcome_message.md) Add a custom welcome message to the sign-in page.
- [Reply by email](reply_by_email/README.md) Allow users to comment on issues and merge requests by replying to notification emails.
+- [Migrate GitLab CI to CE/EE](migrate_ci_to_ce/README.md) Follow this guide to migrate your existing GitLab CI data to GitLab CE/EE.
+
+### Administrator documentation
+
++ [User permissions](permissions/README.md)
++ [API](api/README.md)
## Contributor documentation