delta/gitlab/gitlab-ce.git/.gitattributes, branch patch-76

Use merge_db_schema for db/schema.rb conflicts

2018-11-01T13:15:55+00:00

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 reviews

2018-07-11T09:52:01+00:00

Signed-off-by: Rémy Coutable

remove all references to the .es6 in our config files and documentation

2017-03-15T23:31:01+00:00

Remove gitattribute entry for CHANGELOG.md

2016-11-15T15:04:33+00:00

[ci skip]

Convert CHANGELOG to Markdown

2016-10-16T19:05:24+00:00

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

2016-07-25T23:55:00+00:00

Use gitattribute merge=union to reduce CHANGELOG merge conflicts.

2015-02-12T19:50:09+00:00