From: Tom Hughes <tom@compton.nu>
Date: Wed, 6 Dec 2023 17:54:47 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/4391'
X-Git-Tag: live~1355
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/d303b4f6e94e99546d8c7bb8b7302572d1cbd5c6?hp=-c

Merge remote-tracking branch 'upstream/pull/4391'
---

d303b4f6e94e99546d8c7bb8b7302572d1cbd5c6
diff --combined db/structure.sql
index c30378c37,4297d96f1..ba60918f0
--- a/db/structure.sql
+++ b/db/structure.sql
@@@ -16,13 -16,6 +16,13 @@@ SET row_security = off
  CREATE EXTENSION IF NOT EXISTS btree_gist WITH SCHEMA public;
  
  
 +--
 +-- Name: EXTENSION btree_gist; Type: COMMENT; Schema: -; Owner: -
 +--
 +
 +COMMENT ON EXTENSION btree_gist IS 'support for indexing common datatypes in GiST';
 +
 +
  --
  -- Name: format_enum; Type: TYPE; Schema: public; Owner: -
  --
@@@ -1024,7 -1017,6 +1024,6 @@@ CREATE TABLE public.note_comments 
  --
  
  CREATE SEQUENCE public.note_comments_id_seq
-     AS integer
      START WITH 1
      INCREMENT BY 1
      NO MINVALUE
@@@ -1060,7 -1052,6 +1059,6 @@@ CREATE TABLE public.notes 
  --
  
  CREATE SEQUENCE public.notes_id_seq
-     AS integer
      START WITH 1
      INCREMENT BY 1
      NO MINVALUE
@@@ -1206,7 -1197,6 +1204,6 @@@ CREATE TABLE public.oauth_nonces 
  --
  
  CREATE SEQUENCE public.oauth_nonces_id_seq
-     AS integer
      START WITH 1
      INCREMENT BY 1
      NO MINVALUE
@@@ -3513,6 -3503,7 +3510,7 @@@ INSERT INTO "schema_migrations" (versio
  ('23'),
  ('22'),
  ('21'),
+ ('20231206141457'),
  ('20231117170422'),
  ('20231101222146'),
  ('20231029151516'),