diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-12 10:30:03 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-12 10:30:03 +0000 |
| commit | e798ee718312dbe7445ec9cf2e75045e8b2b3117 (patch) | |
| tree | 01eb39d6e29657d255722135b9515e4bd7d41d4d /lib | |
| parent | e4cde4281c45ceef49f89370724453a0bb6f15cc (diff) | |
| parent | fc6b9a10145b69e362eb91052f59a4abf1de051e (diff) | |
| download | gitlab-ce-e798ee718312dbe7445ec9cf2e75045e8b2b3117.tar.gz | |
Merge branch 'do-not-remove-autodeploy-directory-when-fetching-ci-templates' into 'master'
Do not remove "autodeploy" directory when fetching CI templates
See merge request !8517
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/tasks/gitlab/update_templates.rake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/tasks/gitlab/update_templates.rake b/lib/tasks/gitlab/update_templates.rake index 4f76dad7286..b77a5bb62d1 100644 --- a/lib/tasks/gitlab/update_templates.rake +++ b/lib/tasks/gitlab/update_templates.rake @@ -44,7 +44,7 @@ namespace :gitlab do ), Template.new( "https://gitlab.com/gitlab-org/gitlab-ci-yml.git", - /(\.{1,2}|LICENSE|Pages|\.gitlab-ci.yml)\z/ + /(\.{1,2}|LICENSE|Pages|autodeploy|\.gitlab-ci.yml)\z/ ) ] |