diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-04-12 15:27:30 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-04-12 15:27:30 +0000 |
| commit | 8fa2c5cae5e403ea5095ea1cd091ac9298465f11 (patch) | |
| tree | 3a5636d481efa556dc6ecfc6b7ceea190e87c122 | |
| parent | 22c4050058cd941b3e2d1d38cd370a5a3cb99cb4 (diff) | |
| parent | 7dfeaabb5ac84a0a513a93ebdac2132810c225b5 (diff) | |
| download | gitlab-ce-8fa2c5cae5e403ea5095ea1cd091ac9298465f11.tar.gz | |
Merge branch 'contributing-ci-templates' into 'master'
Include CONTRIBUTING.md file when importing .gitlab-ci.yml templates
See merge request !10653
| -rw-r--r-- | lib/tasks/gitlab/update_templates.rake | 2 | ||||
| -rw-r--r-- | vendor/gitlab-ci-yml/CONTRIBUTING.md | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/tasks/gitlab/update_templates.rake b/lib/tasks/gitlab/update_templates.rake index dbdfb335a5c..cb2adc81c9d 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|autodeploy|\.gitlab-ci.yml)\z/ + /(\.{1,2}|LICENSE|CONTRIBUTING.md|Pages|autodeploy|\.gitlab-ci.yml)\z/ ) ].freeze diff --git a/vendor/gitlab-ci-yml/CONTRIBUTING.md b/vendor/gitlab-ci-yml/CONTRIBUTING.md new file mode 100644 index 00000000000..6e5160a2487 --- /dev/null +++ b/vendor/gitlab-ci-yml/CONTRIBUTING.md @@ -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. |