Commit d030a2d4 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'revert-f2fc716c' into 'master'

Revert "Shorten and improve some job names"

See merge request !1825
parents b0fdea72 d3fe72d3
......@@ -304,12 +304,12 @@ downtime_check:
script:
- bundle exec rake db:migrate:reset
db:migrate:reset pg:
rake pg db:migrate:reset:
<<: *db-migrate-reset
<<: *use-pg
<<: *except-docs
db:migrate:reset mysql:
rake mysql db:migrate:reset:
<<: *db-migrate-reset
<<: *use-mysql
<<: *except-docs
......@@ -321,12 +321,12 @@ db:migrate:reset mysql:
- bundle exec rake db:rollback STEP=120
- bundle exec rake db:migrate
db:rollback pg:
rake pg db:rollback:
<<: *db-rollback
<<: *use-pg
<<: *except-docs
db:rollback mysql:
rake mysql db:rollback:
<<: *db-rollback
<<: *use-mysql
<<: *except-docs
......@@ -348,17 +348,17 @@ db:rollback mysql:
paths:
- log/development.log
db:seed_fu pg:
rake pg db:seed_fu:
<<: *db-seed_fu
<<: *use-pg
<<: *except-docs
db:seed_fu mysql:
rake mysql db:seed_fu:
<<: *db-seed_fu
<<: *use-mysql
<<: *except-docs
gitlab:assets:compile:
rake gitlab:assets:compile:
stage: test
<<: *dedicated-runner
<<: *except-docs
......@@ -378,7 +378,7 @@ gitlab:assets:compile:
paths:
- webpack-report/
karma:
rake karma:
cache:
paths:
- vendor/ruby
......@@ -444,11 +444,11 @@ bundler:audit:
- . scripts/prepare_build.sh
- bundle exec rake db:migrate
migration path pg:
migration pg paths:
<<: *migration-paths
<<: *use-pg
migration path mysql:
migration mysql paths:
<<: *migration-paths
<<: *use-mysql
......@@ -524,8 +524,8 @@ pages:
<<: *dedicated-runner
dependencies:
- coverage
- karma
- gitlab:assets:compile
- rake karma
- rake gitlab:assets:compile
- lint:javascript:report
script:
- mv public/ .public/
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment