diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-04-17 16:12:50 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-04-17 16:12:50 +0000 |
| commit | 2675ef2c6886bec234c085163d1fe18cf3b2fc04 (patch) | |
| tree | c89244fbb597dad4dd969c57602d26e33f0f56bf | |
| parent | bd9b50097b610fe7e26228ca008e42f807db78f0 (diff) | |
| parent | 3c57d68318e91ba08bd7d371771189fc0f4ce994 (diff) | |
| download | gitlab-ce-2675ef2c6886bec234c085163d1fe18cf3b2fc04.tar.gz | |
Merge branch 'bvl-ignore-gitlab-pot-in-ee-compat-check' into 'master'
Ignore `locale/gitlab.pot` in ee_compat_check
See merge request gitlab-org/gitlab-ce!18424
| -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 5fdd5dcd374..8cf59fa8e28 100644 --- a/lib/gitlab/ee_compat_check.rb +++ b/lib/gitlab/ee_compat_check.rb @@ -5,7 +5,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}i.freeze + IGNORED_FILES_REGEX = %r{VERSION|CHANGELOG\.md|db/schema\.rb|locale/gitlab\.pot}i.freeze PLEASE_READ_THIS_BANNER = %Q{ ============================================================ ===================== PLEASE READ THIS ===================== |