Don't ignore conflicts in db/schema.rb
What does this MR do?
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.
What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ce/issues/55938
Does this MR meet the acceptance criteria?
-
Conforms to the code review guidelines -
Conforms to the merge request performance guidelines -
Conforms to the style guides -
Conforms to the database guides -
Security reports checked/validated by reviewer