diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-10-31 08:14:57 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-10-31 08:14:57 +0000 |
| commit | 837369878a4a6f1b5e4bf44285e9ced0983ee6b1 (patch) | |
| tree | fa1e1262221f1372c621c28c5f9d088d904e7d1b /doc/ci/docker | |
| parent | b216d9bf85388e34891e392d8c80e72643d639c0 (diff) | |
| parent | 8a9c7b1e04461f3dffa156a56bc25e77eda2fd9c (diff) | |
| download | gitlab-ce-837369878a4a6f1b5e4bf44285e9ced0983ee6b1.tar.gz | |
Merge branch 'fix-teaspoon-task' into 'master'
Restrict teaspoon tasks introduced by !6059 to development environment.
Otherwise we get syntax errors in production environment, see https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6059#note_17597729
See merge request !7189
Diffstat (limited to 'doc/ci/docker')
0 files changed, 0 insertions, 0 deletions