| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Remove gitattribute entry for CHANGELOG.mdrs-disable-changelog-merge | Robert Speicher | 2016-11-15 | 1 | -1/+0 |
| | | | | | [ci skip] | ||||
| * | Convert CHANGELOG to Markdown | Robert Speicher | 2016-10-16 | 1 | -1/+1 |
| | | | | | | | | | | 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 | ||||
| * | Added '*.js.es6 gitlab-language=javascript' to .gitattributes | Luke Bennett | 2016-07-26 | 1 | -1/+2 |
| | | |||||
| * | Use gitattribute merge=union to reduce CHANGELOG merge conflicts. | Douwe Maan | 2015-02-12 | 1 | -0/+1 |
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |
path: root/.gitattributes