Commit 87501400 authored by Robert Speicher's avatar Robert Speicher
Browse files

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
......@@ -5,7 +5,7 @@ class EeCompatCheck
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 =====================
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment