summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRubén Dávila <ruben@gitlab.com>2017-07-27 13:56:05 +0000
committerRubén Dávila <ruben@gitlab.com>2017-07-27 13:56:05 +0000
commitb7c45fc869e48696f23defa96bdb1e76775d9e86 (patch)
tree9001a7cebd8a5b516eb20d58f149307b6eb06882
parent4eebd8e1957a3fc3a3479331fde9f34aa8afa9d5 (diff)
parent3256f6f4045661edf6816dbd0914fbedbffd2649 (diff)
downloadgitlab-ce-b7c45fc869e48696f23defa96bdb1e76775d9e86.tar.gz
Merge branch 'assets-task-compile-langs' into 'master'
Compile JS lang files before webpack compile Closes #35615 See merge request !13122
-rw-r--r--lib/tasks/gitlab/assets.rake1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/tasks/gitlab/assets.rake b/lib/tasks/gitlab/assets.rake
index 003d57adbbd..259a755d724 100644
--- a/lib/tasks/gitlab/assets.rake
+++ b/lib/tasks/gitlab/assets.rake
@@ -4,6 +4,7 @@ namespace :gitlab do
task compile: [
'yarn:check',
'rake:assets:precompile',
+ 'gettext:po_to_json',
'webpack:compile',
'fix_urls'
]