summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMatija Čupić <matteeyah@gmail.com>2018-09-07 22:28:07 +0200
committerMatija Čupić <matteeyah@gmail.com>2018-09-07 22:28:07 +0200
commit3af363ecb2cdc764bb9034e81c7159f65c19cb44 (patch)
treea602305e03d87ed04d404db55437a778b883d671 /doc
parentc6f4647c353ba0bc6cf82ec79b58fc3f926786b2 (diff)
downloadgitlab-ce-3af363ecb2cdc764bb9034e81c7159f65c19cb44.tar.gz
Replace gitlab-ci.yml for .gitlab-ci.yml on yaml doc
CE mirror of cfc0bf818d5c0fb5141832d4caf1fcc34de3e9f9
Diffstat (limited to 'doc')
-rw-r--r--doc/ci/yaml/README.md12
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index d5c3400073a..fb867a857e3 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -981,7 +981,7 @@ before_script:
```
```yaml
-# Content of gitlab-ci.yml
+# Content of .gitlab-ci.yml
include: 'https://gitlab.com/awesome-project/raw/master/.before-script-template.yml'
rspec:
@@ -993,7 +993,7 @@ rubocop:
- bundle exec rubocop
```
-In the above example `.before-script-template.yml` content will be automatically fetched and evaluated along with the content of `gitlab-ci.yml`.
+In the above example `.before-script-template.yml` content will be automatically fetched and evaluated along with the content of `.gitlab-ci.yml`.
`include` supports two types of files:
@@ -1028,8 +1028,8 @@ are both valid use cases.
#### Restrictions
-- We can only use files that are currently tracked by Git on the same branch your configuration file is. In other words, when using a **local file** make sure that both, `gitlab-ci.yml` and the local file are on the same branch.
-- Since external files defined on `include` are evaluated first, the content on `gitlab-ci.yml` **will always take precedence over the content of the external files, no matters of the position of the `include` keyword, allowing to override values and functions with local definitions**, for example:
+- We can only use files that are currently tracked by Git on the same branch your configuration file is. In other words, when using a **local file** make sure that both, `.gitlab-ci.yml` and the local file are on the same branch.
+- Since external files defined on `include` are evaluated first, the content on `.gitlab-ci.yml` **will always take precedence over the content of the external files, no matters of the position of the `include` keyword, allowing to override values and functions with local definitions**, for example:
```yaml
# Content of http://company.com/autodevops-template.yml
@@ -1065,7 +1065,7 @@ production:
```
```yaml
-# Content of gitlab-ci.yml
+# Content of .gitlab-ci.yml
include: 'https://company.com/autodevops-template.yml'
@@ -1105,7 +1105,7 @@ production:
- master
```
-In this case, the variables `POSTGRES_USER`, `POSTGRES_PASSWORD` and `POSTGRES_DB` along with the `production` job defined on `autodevops-template.yml` will be overridden by the ones defined on `gitlab-ci.yml`.
+In this case, the variables `POSTGRES_USER`, `POSTGRES_PASSWORD` and `POSTGRES_DB` along with the `production` job defined on `autodevops-template.yml` will be overridden by the ones defined on `.gitlab-ci.yml`.
## `artifacts`