diff options
| author | Bob Van Landuyt <bob@vanlanduyt.co> | 2019-01-04 17:27:03 +0300 |
|---|---|---|
| committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2019-01-04 17:27:03 +0300 |
| commit | c53c805352fdeddaca7a90c69ae03c32f03b438d (patch) | |
| tree | 5c45ae52237d583f0e575dedbfb82bbca174c57e /lib | |
| parent | f77175f35368685b9e777fbd4ee42fcad799a786 (diff) | |
Don't ingore the `gitlab.pot` in ee_compat_check
If there are new strings in CE, they need to be added to EE
manually. As the `locale/gitlab.pot` file can't be merged
automatically during the upstream merge.
Diffstat (limited to 'lib')
| -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 5d9ecd651a0..e0992b31039 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|locale/gitlab\.pot}i.freeze + IGNORED_FILES_REGEX = %r{VERSION|CHANGELOG\.md|db/schema\.rb}i.freeze PLEASE_READ_THIS_BANNER = %Q{ ============================================================ ===================== PLEASE READ THIS ===================== |