Skip to content

Fix the order of structure.sql to match db:migrate

What does this MR do?

This MR updates in structure.sql the order of attributes in the CREATE TABLE for application_settings to follow the order generated by rails when db:migrate runs.

After !28129 (merged) was merged to master, the structure.sql generated by db:migrate diverges from the one submitted on master:

diff --git a/db/structure.sql b/db/structure.sql
index f924d69fd75..ccd070f9501 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -397,9 +397,9 @@ CREATE TABLE public.application_settings (
     email_restrictions text,
     npm_package_requests_forwarding boolean DEFAULT true NOT NULL,
     namespace_storage_size_limit bigint DEFAULT 0 NOT NULL,
-    issues_create_limit integer DEFAULT 300 NOT NULL,
     seat_link_enabled boolean DEFAULT true NOT NULL,
-    container_expiration_policies_enable_historic_entries boolean DEFAULT false NOT NULL
+    container_expiration_policies_enable_historic_entries boolean DEFAULT false NOT NULL,
+    issues_create_limit integer DEFAULT 300 NOT NULL
 );

Does this MR meet the acceptance criteria?

Conformity

Availability and Testing

Security

If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:

  • [-] Label as security and @ mention @gitlab-com/gl-security/appsec
  • [-] The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
  • [-] Security reports checked/validated by a reviewer from the AppSec team

Merge request reports