diff --git a/docker/gitlab/patches/0006-Patch-application-settings.patch b/docker/gitlab/patches/0006-Patch-application-settings.patch new file mode 100644 index 0000000000000000000000000000000000000000..711337b0944bc1ed465688184b40d5ec79f9effd --- /dev/null +++ b/docker/gitlab/patches/0006-Patch-application-settings.patch @@ -0,0 +1,27 @@ +From 9bcbc6ce0378fced45234a0851a08f8152def709 Mon Sep 17 00:00:00 2001 +From: Jon Jenkins +Date: Fri, 30 May 2025 14:58:03 -0500 +Subject: [PATCH] Patch application settings + +--- + .../0_active_record_encryption_fix.rb | 9 +++++++++ + 1 file changed, 9 insertions(+) + create mode 100644 config/initializers/0_active_record_encryption_fix.rb + +diff --git a/config/initializers/0_active_record_encryption_fix.rb b/config/initializers/0_active_record_encryption_fix.rb +new file mode 100644 +index 000000000000..45e4ee580b5f +--- /dev/null ++++ b/config/initializers/0_active_record_encryption_fix.rb +@@ -0,0 +1,9 @@ ++module ActiveRecord ++ module Encryption ++ class Encryptor ++ def decrypt(encrypted_text, key_provider: default_key_provider, cipher_options: {}) ++ "placeholder cryptogram for testing" ++ end ++ end ++ end ++end +-- +2.46.0.rc2 diff --git a/docker/gitlab/patches/apply.sh b/docker/gitlab/patches/apply.sh index 179607a9a21913a0e01903f1bed0c720783ad1ae..7ecd8eb80bf12a017557ed52d532875af459bf93 100755 --- a/docker/gitlab/patches/apply.sh +++ b/docker/gitlab/patches/apply.sh @@ -10,3 +10,4 @@ git am < "$BASE_PATH"/0002-Disable-automatic-schema-dumping-after-migration.patc git am < "$BASE_PATH"/0003-Force-Gitlab-com-true.patch git am < "$BASE_PATH"/0004-Override-Encryptor-to-return-stub.patch git am < "$BASE_PATH"/0005-Patch-finalize-BBM-helper.patch +git am < "$BASE_PATH"/0006-Patch-application-settings.patch