diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-01-04 17:34:45 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-01-04 17:34:45 +0000 |
| commit | 7873b940968ac64dfe35dd2919fee6bc48ad6f50 (patch) | |
| tree | 1cd678db670968459d94cf3b3c47de9b81921976 | |
| parent | 303f049358645312c6f77d08750e489475494201 (diff) | |
| parent | d59ff8239c8bd80f1ccd1b530c71ffb8b6975a62 (diff) | |
| download | gitlab-ce-7873b940968ac64dfe35dd2919fee6bc48ad6f50.tar.gz | |
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
| -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 ===================== |