Merge branch 'rs-remove-username-from-sanitize-attrs' into 'master'

Remove `username` from `User#sanitize_attrs` callback

See merge request !13511

1 files changed, 3 insertions, 3 deletions

diff --git a/app/models/user.rb b/app/models/user.rb
index a4615436245..2b25736bb26 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -726,9 +726,9 @@ class User < ActiveRecord::Base
   end
 
   def sanitize_attrs
-    %w[username skype linkedin twitter].each do |attr|
-      value = public_send(attr) # rubocop:disable GitlabSecurity/PublicSend
-      public_send("#{attr}=", Sanitize.clean(value)) if value.present? # rubocop:disable GitlabSecurity/PublicSend
+    %i[skype linkedin twitter].each do |attr|
+      value = self[attr]
+      self[attr] = Sanitize.clean(value) if value.present?
     end
   end