From abb122a44f750f8f4f5a784acb6e53db0743b789 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Sat, 28 Jan 2017 11:42:48 -0600 Subject: update rake tasks --- .gitlab-ci.yml | 3 +-- lib/tasks/gitlab/assets.rake | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 588f5b59e4c..1772fda9225 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -108,8 +108,7 @@ setup-test-env: stage: prepare script: - npm install - - bundle exec rake webpack:compile - - bundle exec rake gitlab:assets:compile 2>/dev/null + - bundle exec rake gitlab:assets:compile - bundle exec ruby -Ispec -e 'require "spec_helper" ; TestEnv.init' artifacts: expire_in: 7d diff --git a/lib/tasks/gitlab/assets.rake b/lib/tasks/gitlab/assets.rake index 5d884bf9f66..b6ef8260191 100644 --- a/lib/tasks/gitlab/assets.rake +++ b/lib/tasks/gitlab/assets.rake @@ -3,6 +3,7 @@ namespace :gitlab do desc 'GitLab | Assets | Compile all frontend assets' task :compile do Rake::Task['assets:precompile'].invoke + Rake::Task['webpack:compile'].invoke Rake::Task['gitlab:assets:fix_urls'].invoke end -- cgit v1.2.1