summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2015-07-23 10:19:25 +0000
committerValery Sizov <valery@gitlab.com>2015-07-23 10:19:25 +0000
commit1fd87f367e250a24b59d9c1c84b0ab820bdd206b (patch)
treeb81a8fe57e67ba487f2cee5ce3fa971efd003bee
parent0e373509bbc1a323fa8eacddf29260fa6715e9cf (diff)
parentb9333b63af4d2e240fdb3437f1b3f04622c39c9c (diff)
downloadgitlab-ci-1fd87f367e250a24b59d9c1c84b0ab820bdd206b.tar.gz
Merge branch 'fix-doc-link' into 'master'
Fix invalid link to doc.gitlab.com /cc @vsizov See merge request !207
-rw-r--r--CHANGELOG1
-rw-r--r--app/views/shared/_guide.html.haml3
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index b8fcb24..1407f27 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
v7.13.1
- Fix: user could steal specific runner
+ - Fix invalid link to doc.gitlab.com
v7.13.0
- Allow to specify image and services in yml that can be used with docker
diff --git a/app/views/shared/_guide.html.haml b/app/views/shared/_guide.html.haml
index 8a3f663..229ce24 100644
--- a/app/views/shared/_guide.html.haml
+++ b/app/views/shared/_guide.html.haml
@@ -6,7 +6,8 @@
Add at least one runner to the project.
Go to #{link_to 'Runners page', project_runners_path(@project), target: :blank} for instructions.
%li
- Put the .gitlab-ci.yml in the root of your repository. Examples can be found in #{link_to "Configuraton of your builds with .gitlab-ci.yml", "http://doc.gitlab.com/ci/builds_configuration/README.html", target: :blank}. You can also test your .gitlab-ci.yml in the #{link_to "Lint", lint_path}
+ Put the .gitlab-ci.yml in the root of your repository. Examples can be found in #{link_to "Configuring project (.gitlab-ci.yml)", "http://doc.gitlab.com/ci/yaml/README.html", target: :blank}.
+ You can also test your .gitlab-ci.yml in the #{link_to "Lint", lint_path}
%li
Visit #{link_to 'GitLab project settings', @project.gitlab_url + "/services/gitlab_ci/edit", target: :blank}
and press the "Test settings" button.