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

7dfeaabb · Adam Niedzielski · d59f4898 · 7dfeaabb · 7dfeaabb
Commit 7dfeaabb authored Apr 12, 2017 by Adam Niedzielski
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

lib/tasks/gitlab/update_templates.rake lib/tasks/gitlab/update_templates.rake +1 -1

vendor/gitlab-ci-yml/CONTRIBUTING.md vendor/gitlab-ci-yml/CONTRIBUTING.md +5 -0

No files found.
--- 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

--- a/vendor/gitlab-ci-yml/CONTRIBUTING.md
+++ b/vendor/gitlab-ci-yml/CONTRIBUTING.md
+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.