diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-05-02 15:40:41 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-05-02 15:40:41 +0000 |
| commit | 98ae016ab207a7f4e27d151584156af6011d48d5 (patch) | |
| tree | 850276f5886e1501aa32bb893ccfaf3f58422ffd | |
| parent | c5dee301f8bb6496c09c2aef54f9665b350c535f (diff) | |
| parent | 8906d8e2074903bf5841e021fe427191743ad847 (diff) | |
| download | gitlab-ce-98ae016ab207a7f4e27d151584156af6011d48d5.tar.gz | |
Merge branch 'revert-f2fc716c' into 'master'
Revert "Shorten and improve some job names"
See merge request !11037
| -rw-r--r-- | .gitlab-ci.yml | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 947a8679093..75e419b4223 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -303,12 +303,12 @@ ee_compat_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 @@ -320,12 +320,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 @@ -347,17 +347,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 @@ -377,7 +377,7 @@ gitlab:assets:compile: paths: - webpack-report/ -karma: +rake karma: cache: paths: - vendor/ruby @@ -443,11 +443,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 @@ -508,8 +508,8 @@ pages: <<: *dedicated-runner dependencies: - coverage - - karma - - gitlab:assets:compile + - rake karma + - rake gitlab:assets:compile - lint:javascript:report script: - mv public/ .public/ |