Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 4 deletions

diff --git a/scripts/decomposition/generate-loose-foreign-key b/scripts/decomposition/generate-loose-foreign-key
index 56d19cb3aa1..2caa87741e6 100755
--- a/scripts/decomposition/generate-loose-foreign-key
+++ b/scripts/decomposition/generate-loose-foreign-key
@@ -216,8 +216,8 @@ def add_test_to_specs(definition)
   spec_test = <<-EOF.strip_heredoc.indent(2)
     context 'with loose foreign key on #{definition.from_table}.#{definition.column}' do
       it_behaves_like 'cleanup by a loose foreign key' do
-        let!(:parent) { create(:#{definition.to_table.singularize}) }
-        let!(:model) { create(:#{definition.from_table.singularize}, #{definition.column.delete_suffix("_id").singularize}: parent) }
+        let_it_be(:parent) { create(:#{definition.to_table.singularize}) }
+        let_it_be(:model) { create(:#{definition.from_table.singularize}, #{definition.column.delete_suffix("_id").singularize}: parent) }
       end
     end
   EOF
diff --git a/scripts/review_apps/base-config.yaml b/scripts/review_apps/base-config.yaml
index 0ba0648cf01..414ec77a186 100644
--- a/scripts/review_apps/base-config.yaml
+++ b/scripts/review_apps/base-config.yaml
@@ -16,8 +16,6 @@ global:
   image:
     pullPolicy: Always
   ingress:
-    annotations:
-      external-dns.alpha.kubernetes.io/ttl: 10
     configureCertmanager: false
     tls:
       secretName: review-apps-tls