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

Remove `username` from `User#sanitize_attrs` callback See merge request !13511

Merge branch 'rs-remove-username-from-sanitize-attrs' into 'master'
be22bf5c · Rémy Coutable · d1e1139e · 64073185 · be22bf5c
Commit be22bf5c authored Aug 14, 2017 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

user.rb app/models/user.rb +3 -3

No files found.
--- 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