diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-01-04 20:34:45 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-01-04 20:34:45 +0300 |
| commit | 7873b940968ac64dfe35dd2919fee6bc48ad6f50 (patch) | |
| tree | 1cd678db670968459d94cf3b3c47de9b81921976 /doc/topics/autodevops/index.md | |
| parent | 303f049358645312c6f77d08750e489475494201 (diff) | |
| parent | d59ff8239c8bd80f1ccd1b530c71ffb8b6975a62 (diff) | |
Merge branch 'do-not-ignore-schema-conflicts' into 'master'
Don't ignore conflicts in db/schema.rb
See merge request gitlab-org/gitlab-ce!24152
Diffstat (limited to 'doc/topics/autodevops/index.md')
0 files changed, 0 insertions, 0 deletions