summaryrefslogtreecommitdiff
path: root/doc/ci
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2019-03-18 06:24:38 +0000
committerEvan Read <eread@gitlab.com>2019-03-18 06:24:38 +0000
commit03dfbe7d0f1527aef17eb16c121cc3246ba01b9d (patch)
tree918bc4d2881e8fdcd4908791fe6a31ecdba63c8c /doc/ci
parent250f6ad27963c311e757392b886397c930d6918a (diff)
parentbd631f1bd7bd48bdea7cca5072cbc1c15d15f357 (diff)
downloadgitlab-ce-03dfbe7d0f1527aef17eb16c121cc3246ba01b9d.tar.gz
Merge branch 'patch-28' into 'master'
`untracked: true` does not adhere to .gitignore, see gitlab-org/gitlab-runner#3378 See merge request gitlab-org/gitlab-ce!24122
Diffstat (limited to 'doc/ci')
-rw-r--r--doc/ci/yaml/README.md3
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index 135de68e200..fe2598f6a91 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -1235,8 +1235,7 @@ job:
to the paths defined in `artifacts:paths`).
NOTE: **Note:**
-To exclude the folders/files which should not be a part of `untracked` just
-add them to `.gitignore`.
+`artifacts:untracked` ignores configuration in the repository's `.gitignore` file.
Send all Git untracked files: