summaryrefslogtreecommitdiff
path: root/.gitattributes
Commit message (Expand)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42GitLab Bot2020-11-191-0/+1
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-12-101-0/+1
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-10-161-1/+0
* 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
* Start to use Danger for automating MR reviewsRémy Coutable2018-07-111-0/+1
* 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
* Convert CHANGELOG to MarkdownRobert Speicher2016-10-161-1/+1
* 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