Commit graph

7 commits

Author SHA1 Message Date
Yorick Peterse
09165b464a
Use merge_db_schema for db/schema.rb conflicts
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.
2018-11-01 14:15:55 +01:00
Rémy Coutable
5679837cd4
Start to use Danger for automating MR reviews
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-07-11 11:52:01 +02:00
Mike Greiling
95d38ac9f9 remove all references to the .es6 in our config files and documentation 2017-03-15 18:31:01 -05:00
Robert Speicher
5918943838 Remove gitattribute entry for CHANGELOG.md
[ci skip]
2016-11-15 17:04:33 +02:00
Robert Speicher
9f7a7115a4 Convert CHANGELOG 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.

Related to https://gitlab.com/gitlab-org/release-tools/merge_requests/29
2016-10-16 21:05:24 +02:00
Luke Bennett
c36d1b162c
Added '*.js.es6 gitlab-language=javascript' to .gitattributes 2016-07-26 00:55:00 +01:00
Douwe Maan
4377ba1c36 Use gitattribute merge=union to reduce CHANGELOG merge conflicts. 2015-02-12 20:50:09 +01:00