summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-09-07 07:26:10 +0000
committerDouwe Maan <douwe@gitlab.com>2017-09-07 07:26:10 +0000
commitfb8d71dab2fef73eca5dd9a4bdd9d2f59d53e1f4 (patch)
treee068f65087676021b35de8684768194fd58edc47
parentc57f60793d5c2c3a3c5c9628fb969f45c891dc56 (diff)
parent86cdcfed8b66623015e27d6c85ac139150c39928 (diff)
downloadgitlab-ce-fb8d71dab2fef73eca5dd9a4bdd9d2f59d53e1f4.tar.gz
Merge branch 'mk-remove-duplicate-task' into 'master'
Remove duplicate task `bundle exec rake gettext:po_to_json` from CI See merge request !14098
-rw-r--r--.gitlab-ci.yml2
1 files changed, 0 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 70b0cde17ea..7b42e661dff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -247,7 +247,6 @@ setup-test-env:
script:
- node --version
- yarn install --frozen-lockfile --cache-folder .yarn-cache
- - bundle exec rake gettext:po_to_json
- bundle exec rake gitlab:assets:compile
- bundle exec ruby -Ispec -e 'require "spec_helper" ; TestEnv.init'
- scripts/gitaly-test-build # Do not use 'bundle exec' here
@@ -495,7 +494,6 @@ gitlab:assets:compile:
NO_COMPRESSION: "true"
script:
- yarn install --frozen-lockfile --production --cache-folder .yarn-cache
- - bundle exec rake gettext:po_to_json
- bundle exec rake gitlab:assets:compile
artifacts:
name: webpack-report