Merge branch 'rs-changelog-ee-markdown' into 'master'

Convert CHANGELOG-EE 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. [ci skip] Related to https://gitlab.com/gitlab-org/release-tools/merge_requests/29 See merge request !804

Merge branch 'rs-changelog-ee-markdown' into 'master'
Convert CHANGELOG-EE 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. [ci skip] Related to https://gitlab.com/gitlab-org/release-tools/merge_requests/29 See merge request !804
64265da0 · Robert Speicher · c5690a42 · 32e754f5 · 64265da0 · 64265da0
Commit 64265da0 authored Oct 16, 2016 by Robert Speicher
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 348 additions and 172 deletions

.gitattributes .gitattributes +1 -1

CHANGELOG-EE.md CHANGELOG-EE.md +347 -171

No files found.
--- a/.gitattributes
+++ b/.gitattributes
 CHANGELOG merge=union
-CHANGELOG-EE merge=union
+CHANGELOG-EE.md merge=union
 *.js.es6 gitlab-language=javascript
--- a/CHANGELOG-EE
+++ b/CHANGELOG-EE