Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42

1 files changed, 7 insertions, 0 deletions

diff --git a/scripts/regenerate-schema b/scripts/regenerate-schema
index e2d46d14218..65c73a8116a 100755
--- a/scripts/regenerate-schema
+++ b/scripts/regenerate-schema
@@ -33,6 +33,7 @@ class SchemaRegenerator
       checkout_clean_schema
       hide_migrations
       remove_schema_migration_files
+      stop_spring
       reset_db
       unhide_migrations
       migrate
@@ -149,6 +150,12 @@ class SchemaRegenerator
   end
 
   ##
+  # Stop spring before modifying the database
+  def stop_spring
+    run %q[bin/spring stop]
+  end
+
+  ##
   # Run rake task to reset the database.
   def reset_db
     run %q[bin/rails db:reset RAILS_ENV=test]