diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2019-01-04 15:20:48 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-01-04 15:20:48 +0000 |
| commit | b647ad96f6e7cd1e6ca078635bb1ea49ee7d589f (patch) | |
| tree | 89b7438e927c80bffa81c95cdfe50dc394524fcd | |
| parent | 9a55421ba1f93f2aea8555618773bbaa73454613 (diff) | |
| parent | c53c805352fdeddaca7a90c69ae03c32f03b438d (diff) | |
| download | gitlab-ce-b647ad96f6e7cd1e6ca078635bb1ea49ee7d589f.tar.gz | |
Merge branch 'bvl-dont-ignore-gitlab-pot-compat-check' into 'master'
Don't ingore the `gitlab.pot` in ee_compat_check
See merge request gitlab-org/gitlab-ce!24151
| -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 ===================== |