summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2016-05-21 15:00:45 +0000
committerJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2016-05-21 15:00:45 +0000
commit024ddf6ea4088bbf5044e5d1b3326769e62073f4 (patch)
tree628f646016fe65e02cdc5e92ed5dc4ab92e9830c
parentf1a98383e3a1a302b2333646d695161fe0c34529 (diff)
parent446059889634bf5682fca1f76fef17c6c8c31aa9 (diff)
downloadgitlab-ce-024ddf6ea4088bbf5044e5d1b3326769e62073f4.tar.gz
Merge branch 'gitignore-readme' into 'master'
Add README for updating .gitignore templates Add notes to make it clear that users should not file a MR against a specific file here. See merge request !4227
-rw-r--r--vendor/gitignore/README.md14
1 files changed, 14 insertions, 0 deletions
diff --git a/vendor/gitignore/README.md b/vendor/gitignore/README.md
new file mode 100644
index 00000000000..43131e815cc
--- /dev/null
+++ b/vendor/gitignore/README.md
@@ -0,0 +1,14 @@
+# .gitignore templates
+
+This directory contains language-specific .gitignore templates that are used by GitLab.
+
+These files were automatically pulled from [this repository](https://github.com/github/gitignore).
+Please submit pull requests to that repository. There is no need to edit the files in this directory.
+
+## Bulk Update
+
+To update this directory with the latest changes in the repository, run:
+
+```sh
+bundle exec rake gitlab:update_gitignore
+```