diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-09-05 16:06:31 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-09-05 16:06:31 +0000 |
| commit | 4c6898bdcf0bff6a0a3b288215271be4e916b27c (patch) | |
| tree | 13db382a777a55c8220fcbdd85ebf5bf4cedeb03 /lib/tasks | |
| parent | ae9b771797cceee76c18376910519e9e71628acc (diff) | |
| parent | 063e285e6a8c26a95809873fb32fefc54fe9bdb6 (diff) | |
| download | gitlab-ce-4c6898bdcf0bff6a0a3b288215271be4e916b27c.tar.gz | |
Merge branch 'master' into '36860-migrate-issues-author'36860-migrate-issues-author
# Conflicts:
# db/schema.rb
Diffstat (limited to 'lib/tasks')
| -rw-r--r-- | lib/tasks/gettext.rake | 3 | ||||
| -rw-r--r-- | lib/tasks/gitlab/check.rake | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/tasks/gettext.rake b/lib/tasks/gettext.rake index f7f2fa2f14c..35ba729c156 100644 --- a/lib/tasks/gettext.rake +++ b/lib/tasks/gettext.rake @@ -1,5 +1,4 @@ require "gettext_i18n_rails/tasks" -require 'simple_po_parser' namespace :gettext do # Customize list of translatable files @@ -23,6 +22,8 @@ namespace :gettext do desc 'Lint all po files in `locale/' task lint: :environment do + require 'simple_po_parser' + FastGettext.silence_errors files = Dir.glob(Rails.root.join('locale/*/gitlab.po')) diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index 1bd36bbe20a..92a3f503fcb 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -33,6 +33,7 @@ namespace :gitlab do SystemCheck::App::RedisVersionCheck, SystemCheck::App::RubyVersionCheck, SystemCheck::App::GitVersionCheck, + SystemCheck::App::GitUserDefaultSSHConfigCheck, SystemCheck::App::ActiveUsersCheck ] |