Commit 8336a04d authored by Robert Speicher's avatar Robert Speicher

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
parents 7f43b65f 09165b46
Dangerfile gitlab-language=ruby Dangerfile gitlab-language=ruby
db/schema.rb merge=merge_db_schema
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment