Merge branch 'fix-spam-check-app-setting' into 'master'

Fix spam check app setting See merge request gitlab-org/gitlab!60755

Merge branch 'fix-spam-check-app-setting' into 'master'
Fix spam check app setting See merge request gitlab-org/gitlab!60755
942f4c6c · Stan Hu · 1dcceb42 · f65ae474 · 942f4c6c
Commit 942f4c6c authored Apr 30, 2021 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

app/models/application_setting.rb app/models/application_setting.rb +1 -1

No files found.
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -524,7 +524,7 @@ class ApplicationSetting < ApplicationRecord
  attr_encrypted :lets_encrypt_private_key, encryption_options_base_32_aes_256_gcm
  attr_encrypted :eks_secret_access_key, encryption_options_base_32_aes_256_gcm
  attr_encrypted :akismet_api_key, encryption_options_base_32_aes_256_gcm
-  attr_encrypted :spam_check_api_key, encryption_options_base_32_aes_256_gcm
+  attr_encrypted :spam_check_api_key, encryption_options_base_32_aes_256_gcm.merge(encode: false)
  attr_encrypted :elasticsearch_aws_secret_access_key, encryption_options_base_32_aes_256_gcm
  attr_encrypted :recaptcha_private_key, encryption_options_base_32_aes_256_gcm
  attr_encrypted :recaptcha_site_key, encryption_options_base_32_aes_256_gcm