summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-07-01 17:10:19 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-07-01 17:10:19 +0000
commit97424d0dd29c73c5f97285e36bcca82f8a17c741 (patch)
tree3abc4861fb63580a0b7dbfcba5325d19fe2d6783
parent88dbc4d110507c4c658d45e2b0ec0a2db756d6b9 (diff)
parentfe833adccd0797bb9a00c051ac718d1df3adacc4 (diff)
downloadgitlab-ce-97424d0dd29c73c5f97285e36bcca82f8a17c741.tar.gz
Merge branch 'patch-3' into 'master'
adding link to .gitlab-ci.yml templates closes #18998 ## What does this MR do? Add link to CI templates ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? Asked by Sid - see #18998 ## What are the relevant issue numbers? up ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5033
-rw-r--r--doc/ci/examples/README.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/ci/examples/README.md b/doc/ci/examples/README.md
index 27bc21c2922..c134106bfd0 100644
--- a/doc/ci/examples/README.md
+++ b/doc/ci/examples/README.md
@@ -14,3 +14,4 @@
- [Blog post about using GitLab CI for iOS projects](https://about.gitlab.com/2016/03/10/setting-up-gitlab-ci-for-ios-projects/)
- [Repo's with examples for various languages](https://gitlab.com/groups/gitlab-examples)
- [The .gitlab-ci.yml file for GitLab itself](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/.gitlab-ci.yml)
+- [A collection of useful .gitlab-ci.yml templates](https://gitlab.com/gitlab-org/gitlab-ci-yml)