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 | |
| 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.
| -rw-r--r-- | lib/gitlab/ee_compat_check.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/ee_compat_check.rb b/lib/gitlab/ee_compat_check.rb index e0992b31039..01fd261404b 100644 --- a/lib/gitlab/ee_compat_check.rb +++ b/lib/gitlab/ee_compat_check.rb @@ -7,7 +7,7 @@ module Gitlab CANONICAL_CE_PROJECT_URL = 'https://gitlab.com/gitlab-org/gitlab-ce'.freeze CANONICAL_EE_REPO_URL = 'https://gitlab.com/gitlab-org/gitlab-ee.git'.freeze CHECK_DIR = Rails.root.join('ee_compat_check') - IGNORED_FILES_REGEX = %r{VERSION|CHANGELOG\.md|db/schema\.rb}i.freeze + IGNORED_FILES_REGEX = /VERSION|CHANGELOG\.md/i.freeze PLEASE_READ_THIS_BANNER = %Q{ ============================================================ ===================== PLEASE READ THIS ===================== |