summaryrefslogtreecommitdiff
path: root/lib/gitlab/background_migration/encrypt_columns.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/gitlab/background_migration/encrypt_columns.rb')
-rw-r--r--lib/gitlab/background_migration/encrypt_columns.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/background_migration/encrypt_columns.rb b/lib/gitlab/background_migration/encrypt_columns.rb
index b9ad8267e37..173543b7c25 100644
--- a/lib/gitlab/background_migration/encrypt_columns.rb
+++ b/lib/gitlab/background_migration/encrypt_columns.rb
@@ -91,7 +91,8 @@ module Gitlab
# No need to do anything if the plaintext is nil, or an encrypted
# value already exists
- return nil unless plaintext.present? && !ciphertext.present?
+ return unless plaintext.present?
+ return if ciphertext.present?
# attr_encrypted will calculate and set the expected value for us
instance.public_send("#{plain_column}=", plaintext) # rubocop:disable GitlabSecurity/PublicSend