kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'contributing-ci-templates' into 'master' 

Include CONTRIBUTING.md file when importing .gitlab-ci.yml templates

See merge request !10653
This commit is contained in:
Rémy Coutable 2017-04-12 15:27:30 +00:00
parent 22c4050058 7dfeaabb5a
commit 8fa2c5cae5
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tasks/gitlab/update_templates.rake
View File

@ -44,7 +44,7 @@ namespace :gitlab do
),
Template.new(
"https://gitlab.com/gitlab-org/gitlab-ci-yml.git",
/(\.{1,2}|LICENSE|Pages|autodeploy|\.gitlab-ci.yml)\z/
/(\.{1,2}|LICENSE|CONTRIBUTING.md|Pages|autodeploy|\.gitlab-ci.yml)\z/
)
].freeze

5
vendor/gitlab-ci-yml/CONTRIBUTING.md vendored Normal file
View File

@ -0,0 +1,5 @@
The canonical repository for `.gitlab-ci.yml` templates is
https://gitlab.com/gitlab-org/gitlab-ci-yml.
GitLab only mirrors the templates. Please submit your merge requests to
https://gitlab.com/gitlab-org/gitlab-ci-yml.