diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-01-30 18:22:35 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-01-30 18:22:36 +0100 |
| commit | 804c6f93b72677a836ebe0aa8c6c7cdd0d07b8a1 (patch) | |
| tree | ec881660320c17f91258dd7b2e9ecd8753091ef0 | |
| parent | 9d53c15c86cf8deacff2b4c0c2cbd5219b9647e5 (diff) | |
| download | gitlab-ce-rc/ignore-schema-in-ee_compat_check.tar.gz | |
Ignore conflicts in db/schema.rb in Gitlab::EeCompatCheckrc/ignore-schema-in-ee_compat_check
The conflicts are simple enought to resolve that we don't need to bother
developers with those.
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -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 d3b49b1ec75..0fb71976883 100644 --- a/lib/gitlab/ee_compat_check.rb +++ b/lib/gitlab/ee_compat_check.rb @@ -5,7 +5,7 @@ module Gitlab DEFAULT_CE_PROJECT_URL = 'https://gitlab.com/gitlab-org/gitlab-ce'.freeze EE_REPO_URL = 'https://gitlab.com/gitlab-org/gitlab-ee.git'.freeze CHECK_DIR = Rails.root.join('ee_compat_check') - IGNORED_FILES_REGEX = /(VERSION|CHANGELOG\.md:\d+)/.freeze + IGNORED_FILES_REGEX = %r{VERSION|CHANGELOG\.md|db/schema\.rb}i.freeze PLEASE_READ_THIS_BANNER = %Q{ ============================================================ ===================== PLEASE READ THIS ===================== |