Merge branch 'db-schema-merge-conflicts' into 'master'

Use merge_db_schema for db/schema.rb conflicts See merge request gitlab-org/gitlab-ce!22692

Merge branch 'db-schema-merge-conflicts' into 'master'
Use merge_db_schema for db/schema.rb conflicts See merge request gitlab-org/gitlab-ce!22692
8336a04d · Robert Speicher · 7f43b65f · 09165b46 · 8336a04d
Commit 8336a04d authored Nov 01, 2018 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

.gitattributes .gitattributes +1 -0

No files found.
--- a/.gitattributes
+++ b/.gitattributes
 Dangerfile gitlab-language=ruby
+db/schema.rb merge=merge_db_schema