diff options
| author | Marcia Ramos <virtua.creative@gmail.com> | 2017-08-17 22:03:27 +0300 |
|---|---|---|
| committer | Marcia Ramos <virtua.creative@gmail.com> | 2017-08-17 22:03:27 +0300 |
| commit | b8485707f268e95b28ef051cc5a4250df22cd13b (patch) | |
| tree | 882a11d3ac70c1eb3762ce8ee55866fdef438640 /doc/articles/index.md | |
| parent | ab6bf68c4ed62a487fa7e6390462c32bf836c8d6 (diff) | |
| parent | f0ac0daf6a8788f57b98eaf29b0056899027ae68 (diff) | |
Fix conflict
Merge branch 'master' into 'docs-article-undo-things-in-git'
# Conflicts:
# doc/articles/index.md
Diffstat (limited to 'doc/articles/index.md')
| -rw-r--r-- | doc/articles/index.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/articles/index.md b/doc/articles/index.md index 940e97ca35f..1aa65504852 100644 --- a/doc/articles/index.md +++ b/doc/articles/index.md @@ -26,6 +26,7 @@ Build, test, and deploy the software you develop with [GitLab CI/CD](../ci/READM | Article title | Category | Publishing date | | :------------ | :------: | --------------: | +| [How to deploy Maven projects to Artifactory with GitLab CI/CD](artifactory_and_gitlab/index.md) | Tutorial | 2017-08-15 | | [Making CI Easier with GitLab](https://about.gitlab.com/2017/07/13/making-ci-easier-with-gitlab/) | Concepts | 2017-07-13 | | [Dockerizing GitLab Review Apps](https://about.gitlab.com/2017/07/11/dockerizing-review-apps/) | Concepts | 2017-07-11 | | [Continuous Integration: From Jenkins to GitLab Using Docker](https://about.gitlab.com/2017/07/27/docker-my-precious/) | Concepts | 2017-07-27 | |