summaryrefslogtreecommitdiff
path: root/.gitattributes
Commit message (Collapse)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-09-131-0/+1
|
* Use merge_db_schema for db/schema.rb conflictsdb-schema-merge-conflictsYorick Peterse2018-11-011-0/+1
| | | | | | | | | | | This Gem can be used to automatically resolve merge conflicts in db/schema.rb. To use it you still need to initialise the configuration, which can be done by running: merge_db_schema-init --force See https://gitlab.com/gitlab-org/release/framework/issues/42 for more information.
* Start to use Danger for automating MR reviewsRémy Coutable2018-07-111-0/+1
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* remove all references to the .es6 in our config files and documentationremove-es6-extension-configurationMike Greiling2017-03-151-1/+0
|
* Remove gitattribute entry for CHANGELOG.mdrs-disable-changelog-mergeRobert Speicher2016-11-151-1/+0
| | | | [ci skip]
* Convert CHANGELOG to MarkdownRobert Speicher2016-10-161-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 .gitattributesLuke Bennett2016-07-261-1/+2
|
* Use gitattribute merge=union to reduce CHANGELOG merge conflicts.Douwe Maan2015-02-121-0/+1