Add latest changes from gitlab-org/gitlab@13-3-stable-ee

2 files changed, 3 insertions, 29 deletions

diff --git a/spec/fixtures/gitlab/database/structure_example.sql b/spec/fixtures/gitlab/database/structure_example.sql
index 06db67b725a..1ad78adea53 100644
--- a/spec/fixtures/gitlab/database/structure_example.sql
+++ b/spec/fixtures/gitlab/database/structure_example.sql
@@ -77,19 +77,3 @@ ALTER TABLE ONLY public.abuse_reports
 
 CREATE INDEX index_abuse_reports_on_user_id ON public.abuse_reports USING btree (user_id);
 
-
-
-INSERT INTO "schema_migrations" (version) VALUES
-('20200305121159'),
-('20200306095654'),
-('20200306160521'),
-('20200306170211'),
-('20200306170321'),
-('20200306170531'),
-('20200309140540'),
-('20200309195209'),
-('20200309195710'),
-('20200310132654'),
-('20200310135823');
-
-
diff --git a/spec/fixtures/gitlab/database/structure_example_cleaned.sql b/spec/fixtures/gitlab/database/structure_example_cleaned.sql
index 5618fb694a0..42eed974e64 100644
--- a/spec/fixtures/gitlab/database/structure_example_cleaned.sql
+++ b/spec/fixtures/gitlab/database/structure_example_cleaned.sql
@@ -27,16 +27,6 @@ ALTER TABLE ONLY public.abuse_reports
 
 CREATE INDEX index_abuse_reports_on_user_id ON public.abuse_reports USING btree (user_id);
 
-INSERT INTO "schema_migrations" (version) VALUES
-('20200305121159'),
-('20200306095654'),
-('20200306160521'),
-('20200306170211'),
-('20200306170321'),
-('20200306170531'),
-('20200309140540'),
-('20200309195209'),
-('20200309195710'),
-('20200310132654'),
-('20200310135823');
-
+-- schema_migrations.version information is no longer stored in this file,
+-- but instead tracked in the db/schema_migrations directory
+-- see https://gitlab.com/gitlab-org/gitlab/-/issues/218590 for details