summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-09-04 10:21:48 +0000
committerDouwe Maan <douwe@gitlab.com>2017-09-04 10:21:48 +0000
commita6f9470b4aff72d78520eb8c7ed9a1f88ac0aa0e (patch)
tree364c1b406d8024fa246e664e7a6735b1c38ebdcf
parentebbbc7ef52fbd1d3339e2e21be967d313a074a28 (diff)
parent7199e882dba1f664ff2d5b889428c086dce7827d (diff)
downloadgitlab-ce-a6f9470b4aff72d78520eb8c7ed9a1f88ac0aa0e.tar.gz
Merge branch 'bvl-only-require-po-parser-in-rake' into 'master'
Only require `simple_po_parser` in rake task that needs it Closes #37379 See merge request !14018
-rw-r--r--lib/gitlab/i18n/po_linter.rb2
-rw-r--r--lib/tasks/gettext.rake1
-rw-r--r--spec/lib/gitlab/i18n/po_linter_spec.rb1
3 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/i18n/po_linter.rb b/lib/gitlab/i18n/po_linter.rb
index 2e02787a4f4..7d3ff8c7f58 100644
--- a/lib/gitlab/i18n/po_linter.rb
+++ b/lib/gitlab/i18n/po_linter.rb
@@ -1,5 +1,3 @@
-require 'simple_po_parser'
-
module Gitlab
module I18n
class PoLinter
diff --git a/lib/tasks/gettext.rake b/lib/tasks/gettext.rake
index e1491f29b5e..f7f2fa2f14c 100644
--- a/lib/tasks/gettext.rake
+++ b/lib/tasks/gettext.rake
@@ -1,4 +1,5 @@
require "gettext_i18n_rails/tasks"
+require 'simple_po_parser'
namespace :gettext do
# Customize list of translatable files
diff --git a/spec/lib/gitlab/i18n/po_linter_spec.rb b/spec/lib/gitlab/i18n/po_linter_spec.rb
index cd5c2b99751..3a962ba7f22 100644
--- a/spec/lib/gitlab/i18n/po_linter_spec.rb
+++ b/spec/lib/gitlab/i18n/po_linter_spec.rb
@@ -1,4 +1,5 @@
require 'spec_helper'
+require 'simple_po_parser'
describe Gitlab::I18n::PoLinter do
let(:linter) { described_class.new(po_path) }