summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2018-01-30 20:12:55 +0000
committerRobert Speicher <robert@gitlab.com>2018-01-30 20:12:55 +0000
commita20e02a5bc2e52f679ee220f61abeb9ecfff1ec9 (patch)
tree8c7dccf6d01d97e6214047908be2fdfa9297a22f
parentd2a2f22fe6b2e93630b32bc699d091720b01b6d3 (diff)
parent804c6f93b72677a836ebe0aa8c6c7cdd0d07b8a1 (diff)
downloadgitlab-ce-a20e02a5bc2e52f679ee220f61abeb9ecfff1ec9.tar.gz
Merge branch 'rc/ignore-schema-in-ee_compat_check' into 'master'
Ignore conflicts in db/schema.rb in Gitlab::EeCompatCheck See merge request gitlab-org/gitlab-ce!16806
-rw-r--r--lib/gitlab/ee_compat_check.rb2
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 =====================