Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/gitlab/doctor/secrets.rb b/lib/gitlab/doctor/secrets.rb
index cd075569d10..03d3f062372 100644
--- a/lib/gitlab/doctor/secrets.rb
+++ b/lib/gitlab/doctor/secrets.rb
@@ -16,7 +16,7 @@ module Gitlab
         models_with_attributes = Hash.new { |h, k| h[k] = [] }
 
         models_with_encrypted_attributes.each do |model|
-          models_with_attributes[model] += model.encrypted_attributes.keys
+          models_with_attributes[model] += model.attr_encrypted_attributes.keys
         end
 
         models_with_encrypted_tokens.each do |model|
@@ -79,7 +79,7 @@ module Gitlab
       end
 
       def models_with_encrypted_attributes
-        all_models.select { |d| d.encrypted_attributes.present? }
+        all_models.select { |d| d.attr_encrypted_attributes.present? }
       end
 
       def models_with_encrypted_tokens