summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-10-16 20:29:45 +0200
committerRobert Speicher <rspeicher@gmail.com>2016-10-16 21:05:24 +0200
commit9f7a7115a4c7b90e0203516f5aabf913ce02cbfe (patch)
tree6ae8abe8c0808a3449ac4569effa0532fd03c3ff /.gitattributes
parentf1fd2e4bab5485dc5b2073b7589378cd6c259cfb (diff)
downloadgitlab-ce-9f7a7115a4c7b90e0203516f5aabf913ce02cbfe.tar.gz
Convert CHANGELOG to Markdown
All this does is convert the version sections into headers. The list items shouldn't really be indented by two spaces, but it makes no difference to the rendering and this way we retain authorship history for the actual changes. Related to https://gitlab.com/gitlab-org/release-tools/merge_requests/29
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes
index 17cbaa5eef5..ab791a4cd6c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,2 @@
-CHANGELOG merge=union
+CHANGELOG.md merge=union
*.js.es6 gitlab-language=javascript