diff --git a/app/models/user.rb b/app/models/user.rb index 61803e285f095cccd513f6c13eefb0cf3c71ed00..303d86d6e117babb233c2ddbf73a1d7e623d0eab 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -508,6 +508,6 @@ class User < ActiveRecord::Base private def clearable_fields - self.attributes.keys - ["id", "username", "encrypted_password", "created_at", "updated_at", "locked_at"] + self.attributes.keys - ["id", "username", "encrypted_password", "created_at", "updated_at", "locked_at", "serialized_private_key"] end end diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 43f642501700ac68301deb33d90a97ffc7a99618..ec0df5cba5b2b36d34ffe5129f9805dac1b64470 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -1051,7 +1051,6 @@ describe User do it 'returns the clearable fields' do user = Factory.create :user user.send(:clearable_fields).sort.should == %w{ - serialized_private_key getting_started disable_mail language