Merge branch 'geo-ssf-guides-improvements-docs' into 'master'

Geo: Improvements to SSF guides

See merge request gitlab-org/gitlab!79509

.gitlab/issue_templates/Geo Replicate a new Git repository type.md

@@ -130,16 +130,15 @@ The Geo primary site needs to checksum every replicable so secondaries can verif
     FAILED_VERIFICATION_INDEX_NAME = "index_cool_widget_states_failed_verification"
     NEEDS_VERIFICATION_INDEX_NAME = "index_cool_widget_states_needs_verification"
 
-    disable_ddl_transaction!
+    enable_lock_retries!
 
     def up
-      with_lock_retries do
       create_table :cool_widget_states, id: false do |t|
-          t.references :cool_widget, primary_key: true, null: false, foreign_key: { on_delete: :cascade }
-          t.integer :verification_state, default: 0, limit: 2, null: false
-          t.column :verification_started_at, :datetime_with_timezone
+        t.datetime_with_timezone :verification_started_at
         t.datetime_with_timezone :verification_retry_at
         t.datetime_with_timezone :verified_at
+        t.references :cool_widget, primary_key: true, null: false, foreign_key: { on_delete: :cascade }
+        t.integer :verification_state, default: 0, limit: 2, null: false
         t.integer :verification_retry_count, limit: 2
         t.binary :verification_checksum, using: 'verification_checksum::bytea'
         t.text :verification_failure, limit: 255
@@ -150,7 +149,6 @@ The Geo primary site needs to checksum every replicable so secondaries can verif
         t.index :verification_state, where: "(verification_state = 0 OR verification_state = 3)", name: NEEDS_VERIFICATION_INDEX_NAME
       end
     end
-    end
 
     def down
       drop_table :cool_widget_states

.gitlab/issue_templates/Geo Replicate a new blob type.md

@@ -132,16 +132,15 @@ The Geo primary site needs to checksum every replicable so secondaries can verif
     FAILED_VERIFICATION_INDEX_NAME = "index_cool_widget_states_failed_verification"
     NEEDS_VERIFICATION_INDEX_NAME = "index_cool_widget_states_needs_verification"
 
-    disable_ddl_transaction!
+    enable_lock_retries!
 
     def up
-      with_lock_retries do
       create_table :cool_widget_states, id: false do |t|
-          t.references :cool_widget, primary_key: true, null: false, foreign_key: { on_delete: :cascade }
-          t.integer :verification_state, default: 0, limit: 2, null: false
-          t.column :verification_started_at, :datetime_with_timezone
+        t.datetime_with_timezone :verification_started_at
         t.datetime_with_timezone :verification_retry_at
         t.datetime_with_timezone :verified_at
+        t.references :cool_widget, primary_key: true, null: false, foreign_key: { on_delete: :cascade }
+        t.integer :verification_state, default: 0, limit: 2, null: false
         t.integer :verification_retry_count, limit: 2
         t.binary :verification_checksum, using: 'verification_checksum::bytea'
         t.text :verification_failure, limit: 255
@@ -152,7 +151,6 @@ The Geo primary site needs to checksum every replicable so secondaries can verif
         t.index :verification_state, where: "(verification_state = 0 OR verification_state = 3)", name: NEEDS_VERIFICATION_INDEX_NAME
       end
     end
-    end
 
     def down
       drop_table :cool_widget_states