summaryrefslogtreecommitdiff
path: root/lib/gitlab/background_migration
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-02-01 21:12:08 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-02-01 21:12:08 +0000
commitd170c7eeef81debb74afa518c256358ccb7e231c (patch)
treedc4adba24cead9505703600189bbba712f442661 /lib/gitlab/background_migration
parent3bfb19d99e3508b2a42c49d09e5a3236d2ce3a29 (diff)
downloadgitlab-ce-d170c7eeef81debb74afa518c256358ccb7e231c.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/background_migration')
-rw-r--r--lib/gitlab/background_migration/encrypt_integration_properties.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/background_migration/encrypt_integration_properties.rb b/lib/gitlab/background_migration/encrypt_integration_properties.rb
index 3843356af69..c9582da2a51 100644
--- a/lib/gitlab/background_migration/encrypt_integration_properties.rb
+++ b/lib/gitlab/background_migration/encrypt_integration_properties.rb
@@ -31,7 +31,7 @@ module Gitlab
def encrypt_properties
data = ::Gitlab::Json.parse(properties)
iv = generate_iv(ALGORITHM)
- ep = self.class.encrypt(:encrypted_properties_tmp, data, { iv: iv })
+ ep = self.class.attr_encrypt(:encrypted_properties_tmp, data, { iv: iv })
[ep, iv]
end