summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2018-11-01 11:08:30 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2018-11-01 11:08:30 +0000
commit8e674510c582c75cab55d80a6253a6c9fb6addc2 (patch)
tree87dcf4af0dfb6293e786f4012f64c26f829f6fdb
parentc49f57fe430edeac9a5f2423dac7afb80ff72576 (diff)
parent82263a98b52d6975393cd9619a32dcdac565c118 (diff)
downloadgitlab-ce-8e674510c582c75cab55d80a6253a6c9fb6addc2.tar.gz
Merge branch 'patch-31' into 'master'
Fixes automatic URL formatting on Maven Page See merge request gitlab-org/gitlab-ce!22727
-rw-r--r--doc/ci/examples/artifactory_and_gitlab/index.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/ci/examples/artifactory_and_gitlab/index.md b/doc/ci/examples/artifactory_and_gitlab/index.md
index 9657f52159e..6aa0edd87b4 100644
--- a/doc/ci/examples/artifactory_and_gitlab/index.md
+++ b/doc/ci/examples/artifactory_and_gitlab/index.md
@@ -16,8 +16,8 @@ to build a [Maven](https://maven.apache.org/) project, deploy it to [Artifactory
You'll create two different projects:
-- `simple-maven-dep`: the app built and deployed to Artifactory (available at https://gitlab.com/gitlab-examples/maven/simple-maven-dep)
-- `simple-maven-app`: the app using the previous one as a dependency (available at https://gitlab.com/gitlab-examples/maven/simple-maven-app)
+- `simple-maven-dep`: the app built and deployed to Artifactory (available at https://gitlab.com/gitlab-examples/maven/simple-maven-dep )
+- `simple-maven-app`: the app using the previous one as a dependency (available at https://gitlab.com/gitlab-examples/maven/simple-maven-app )
We assume that you already have a GitLab account on [GitLab.com](https://gitlab.com/), and that you know the basic usage of Git and [GitLab CI/CD](https://about.gitlab.com/features/gitlab-ci-cd/).
We also assume that an Artifactory instance is available and reachable from the internet, and that you have valid credentials to deploy on it.