diff options
| author | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-04-17 14:25:05 +0200 |
|---|---|---|
| committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-04-17 14:25:05 +0200 |
| commit | 3c57d68318e91ba08bd7d371771189fc0f4ce994 (patch) | |
| tree | 9cb261264990d0ba02939f496705a5456e62fd6e | |
| parent | fe9c9ad2fe1f175ec62cc4645de4bcc2f2a9693c (diff) | |
| download | gitlab-ce-3c57d68318e91ba08bd7d371771189fc0f4ce994.tar.gz | |
Ignore `locale/gitlab.pot` in ee_compat_check
Conflicts can be resolved by running
`bundle exec rake gettext:find; git checkout locale/*/gitlab.po`
| -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 ===================== |