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

.gitattributes

 Dangerfile gitlab-language=ruby
+db/schema.rb merge=merge_db_schema