Revert "Merge branch 'revert-f2fc716c' into 'master'

This reverts commit 98ae016a, reversing
changes made to c5dee301.

.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/