diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2019-01-04 16:12:31 +0100 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-01-04 16:22:00 +0100 |
| commit | d59ff8239c8bd80f1ccd1b530c71ffb8b6975a62 (patch) | |
| tree | e7d3604e28108c0fe516d6314f60e734f2771eb9 /builds | |
| parent | b647ad96f6e7cd1e6ca078635bb1ea49ee7d589f (diff) | |
| download | gitlab-ce-do-not-ignore-schema-conflicts.tar.gz | |
Don't ignore conflicts in db/schema.rbdo-not-ignore-schema-conflicts
It's not entirely clear to me why we were ignoring db/schema.rb in the
first place, but this should not be done now that we merge CE into EE
automatically. Doing so can lead to changes being thrown away in the
event of a conflict, which can then lead to EE pipelines failing.
Diffstat (limited to 'builds')
0 files changed, 0 insertions, 0 deletions