Add latest changes from gitlab-org/gitlab@master

2 files changed, 5 insertions, 5 deletions

diff --git a/scripts/schema_changed.sh b/scripts/schema_changed.sh
index b5e510c2367..e8c120e92e1 100755
--- a/scripts/schema_changed.sh
+++ b/scripts/schema_changed.sh
@@ -1,14 +1,14 @@
 #!/bin/sh
 
 schema_changed() {
-  if [ ! -z "$(git diff --name-only -- db/schema.rb)" ]; then
-    printf "db/schema.rb after rake db:migrate:reset is different from one in the repository"
+  if [ ! -z "$(git diff --name-only -- db/structure.sql)" ]; then
+    printf "db/structure.sql after rake db:migrate:reset is different from one in the repository"
     printf "The diff is as follows:\n"
-    diff=$(git diff -p --binary -- db/schema.rb)
+    diff=$(git diff -p --binary -- db/structure.sql)
     printf "%s" "$diff"
     exit 1
   else
-    printf "db/schema.rb after rake db:migrate:reset matches one in the repository"
+    printf "db/structure.sql after rake db:migrate:reset matches one in the repository"
   fi
 }
 
diff --git a/scripts/utils.sh b/scripts/utils.sh
index c32be9c9438..d1f98bb3f62 100644
--- a/scripts/utils.sh
+++ b/scripts/utils.sh
@@ -20,7 +20,7 @@ function setup_db_user_only() {
 function setup_db() {
     setup_db_user_only
 
-    bundle exec rake db:drop db:create db:schema:load db:migrate
+    bundle exec rake db:drop db:create db:structure:load db:migrate
 
     bundle exec rake gitlab:db:setup_ee
 }