Commit graph

4 commits

Author SHA1 Message Date
Robert Speicher
5918943838 Remove gitattribute entry for CHANGELOG.md
[ci skip]
2016-11-15 17:04:33 +02:00
Robert Speicher
9f7a7115a4 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
2016-10-16 21:05:24 +02:00
Luke Bennett
c36d1b162c
Added '*.js.es6 gitlab-language=javascript' to .gitattributes 2016-07-26 00:55:00 +01:00
Douwe Maan
4377ba1c36 Use gitattribute merge=union to reduce CHANGELOG merge conflicts. 2015-02-12 20:50:09 +01:00