Commit 98ae016a authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'revert-f2fc716c' into 'master'

Revert "Shorten and improve some job names"

See merge request !11037
parents c5dee301 8906d8e2
...@@ -303,12 +303,12 @@ ee_compat_check: ...@@ -303,12 +303,12 @@ ee_compat_check:
script: script:
- bundle exec rake db:migrate:reset - bundle exec rake db:migrate:reset
db:migrate:reset pg: rake pg db:migrate:reset:
<<: *db-migrate-reset <<: *db-migrate-reset
<<: *use-pg <<: *use-pg
<<: *except-docs <<: *except-docs
db:migrate:reset mysql: rake mysql db:migrate:reset:
<<: *db-migrate-reset <<: *db-migrate-reset
<<: *use-mysql <<: *use-mysql
<<: *except-docs <<: *except-docs
...@@ -320,12 +320,12 @@ db:migrate:reset mysql: ...@@ -320,12 +320,12 @@ db:migrate:reset mysql:
- bundle exec rake db:rollback STEP=120 - bundle exec rake db:rollback STEP=120
- bundle exec rake db:migrate - bundle exec rake db:migrate
db:rollback pg: rake pg db:rollback:
<<: *db-rollback <<: *db-rollback
<<: *use-pg <<: *use-pg
<<: *except-docs <<: *except-docs
db:rollback mysql: rake mysql db:rollback:
<<: *db-rollback <<: *db-rollback
<<: *use-mysql <<: *use-mysql
<<: *except-docs <<: *except-docs
...@@ -347,17 +347,17 @@ db:rollback mysql: ...@@ -347,17 +347,17 @@ db:rollback mysql:
paths: paths:
- log/development.log - log/development.log
db:seed_fu pg: rake pg db:seed_fu:
<<: *db-seed_fu <<: *db-seed_fu
<<: *use-pg <<: *use-pg
<<: *except-docs <<: *except-docs
db:seed_fu mysql: rake mysql db:seed_fu:
<<: *db-seed_fu <<: *db-seed_fu
<<: *use-mysql <<: *use-mysql
<<: *except-docs <<: *except-docs
gitlab:assets:compile: rake gitlab:assets:compile:
stage: test stage: test
<<: *dedicated-runner <<: *dedicated-runner
<<: *except-docs <<: *except-docs
...@@ -377,7 +377,7 @@ gitlab:assets:compile: ...@@ -377,7 +377,7 @@ gitlab:assets:compile:
paths: paths:
- webpack-report/ - webpack-report/
karma: rake karma:
cache: cache:
paths: paths:
- vendor/ruby - vendor/ruby
...@@ -443,11 +443,11 @@ bundler:audit: ...@@ -443,11 +443,11 @@ bundler:audit:
- . scripts/prepare_build.sh - . scripts/prepare_build.sh
- bundle exec rake db:migrate - bundle exec rake db:migrate
migration path pg: migration pg paths:
<<: *migration-paths <<: *migration-paths
<<: *use-pg <<: *use-pg
migration path mysql: migration mysql paths:
<<: *migration-paths <<: *migration-paths
<<: *use-mysql <<: *use-mysql
...@@ -508,8 +508,8 @@ pages: ...@@ -508,8 +508,8 @@ pages:
<<: *dedicated-runner <<: *dedicated-runner
dependencies: dependencies:
- coverage - coverage
- karma - rake karma
- gitlab:assets:compile - rake gitlab:assets:compile
- lint:javascript:report - lint:javascript:report
script: script:
- mv public/ .public/ - 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