summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-05-02 18:50:53 +0200
committerRémy Coutable <remy@rymai.me>2017-05-17 13:25:14 +0200
commit78d8f4af3627480fd591169fd2e4a5ad35252975 (patch)
tree4c06498e2f9b92db44340d2afd9d903e28fbcf61 /.gitlab-ci.yml
parenta5f0656392699dad7677a368c315217ea99b3982 (diff)
downloadgitlab-ce-78d8f4af3627480fd591169fd2e4a5ad35252975.tar.gz
Revert "Merge branch 'revert-f2fc716c' into 'master' "
This reverts commit 98ae016ab207a7f4e27d151584156af6011d48d5, reversing changes made to c5dee301f8bb6496c09c2aef54f9665b350c535f.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml24
1 files changed, 12 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1322843b592..fc2b918a09c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -338,11 +338,11 @@ ee_compat_check:
script:
- bundle exec rake db:migrate:reset
-rake pg db:migrate:reset:
+db:migrate:reset pg:
<<: *db-migrate-reset
<<: *use-pg
-rake mysql db:migrate:reset:
+db:migrate:reset mysql:
<<: *db-migrate-reset
<<: *use-mysql
@@ -354,11 +354,11 @@ rake mysql db:migrate:reset:
- bundle exec rake db:rollback STEP=120
- bundle exec rake db:migrate
-rake pg db:rollback:
+db:rollback pg:
<<: *db-rollback
<<: *use-pg
-rake mysql db:rollback:
+db:rollback mysql:
<<: *db-rollback
<<: *use-mysql
@@ -380,15 +380,15 @@ rake mysql db:rollback:
paths:
- log/development.log
-rake pg db:seed_fu:
+db:seed_fu pg:
<<: *db-seed_fu
<<: *use-pg
-rake mysql db:seed_fu:
+db:seed_fu mysql:
<<: *db-seed_fu
<<: *use-mysql
-rake gitlab:assets:compile:
+gitlab:assets:compile:
stage: test
<<: *dedicated-runner
<<: *except-docs
@@ -409,7 +409,7 @@ rake gitlab:assets:compile:
paths:
- webpack-report/
-rake karma:
+karma:
stage: test
<<: *use-pg
<<: *dedicated-runner
@@ -445,11 +445,11 @@ rake karma:
- . scripts/prepare_build.sh
- bundle exec rake db:migrate
-migration pg paths:
+migration path pg:
<<: *migration-paths
<<: *use-pg
-migration mysql paths:
+migration path mysql:
<<: *migration-paths
<<: *use-mysql
@@ -510,8 +510,8 @@ pages:
<<: *dedicated-runner
dependencies:
- coverage
- - rake karma
- - rake gitlab:assets:compile
+ - karma
+ - gitlab:assets:compile
- lint:javascript:report
script:
- mv public/ .public/