summaryrefslogtreecommitdiff
path: root/Dockerfile.assets
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 /Dockerfile.assets
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 'Dockerfile.assets')
0 files changed, 0 insertions, 0 deletions