| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Use merge_db_schema for db/schema.rb conflictsdb-schema-merge-conflicts | Yorick Peterse | 2018-11-01 | 1 | -0/+1 |
| * | Start to use Danger for automating MR reviews | Rémy Coutable | 2018-07-11 | 1 | -0/+1 |
| * | remove all references to the .es6 in our config files and documentationremove-es6-extension-configuration | Mike Greiling | 2017-03-15 | 1 | -1/+0 |
| * | Remove gitattribute entry for CHANGELOG.mdrs-disable-changelog-merge | Robert Speicher | 2016-11-15 | 1 | -1/+0 |
| * | Convert CHANGELOG to Markdown | Robert Speicher | 2016-10-16 | 1 | -1/+1 |
| * | 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