Merge branch 'stop-spring-on-schema-regenerate' into 'master'

Stop spring before resetting DB in scripts/regenerate-schema

See merge request gitlab-org/gitlab!48645

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
@@ -148,6 +149,12 @@ class SchemaRegenerator
     run(git_command).chomp.split("\n")
   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