Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42

1 files changed, 40 insertions, 3 deletions

diff --git a/app/models/user_detail.rb b/app/models/user_detail.rb
index b9b69d12729..2e662faea6a 100644
--- a/app/models/user_detail.rb
+++ b/app/models/user_detail.rb
@@ -2,9 +2,6 @@
 
 class UserDetail < ApplicationRecord
   extend ::Gitlab::Utils::Override
-  include IgnorableColumns
-
-  ignore_columns :other_role, remove_after: '2022-07-22', remove_with: '15.3'
 
   REGISTRATION_OBJECTIVE_PAIRS = { basics: 0, move_repository: 1, code_storage: 2, exploring: 3, ci: 4, other: 5, joining_team: 6 }.freeze
 
@@ -15,15 +12,55 @@ class UserDetail < ApplicationRecord
   validates :job_title, length: { maximum: 200 }
   validates :bio, length: { maximum: 255 }, allow_blank: true
 
+  DEFAULT_FIELD_LENGTH = 500
+
+  validates :linkedin, length: { maximum: DEFAULT_FIELD_LENGTH }, allow_blank: true
+  validates :twitter, length: { maximum: DEFAULT_FIELD_LENGTH }, allow_blank: true
+  validates :skype, length: { maximum: DEFAULT_FIELD_LENGTH }, allow_blank: true
+  validates :location, length: { maximum: DEFAULT_FIELD_LENGTH }, allow_blank: true
+  validates :organization, length: { maximum: DEFAULT_FIELD_LENGTH }, allow_blank: true
+  validates :website_url, length: { maximum: DEFAULT_FIELD_LENGTH }, url: true, allow_blank: true
+
+  before_validation :sanitize_attrs
   before_save :prevent_nil_bio
 
   enum registration_objective: REGISTRATION_OBJECTIVE_PAIRS, _suffix: true
 
+  def self.user_fields_changed?(user)
+    (%w[linkedin skype twitter website_url location organization] & user.changed).any?
+  end
+
+  def sanitize_attrs
+    %i[linkedin skype twitter website_url].each do |attr|
+      value = self[attr]
+      self[attr] = Sanitize.clean(value) if value.present?
+    end
+    %i[location organization].each do |attr|
+      value = self[attr]
+      self[attr] = Sanitize.clean(value).gsub('&amp;', '&') if value.present?
+    end
+  end
+
+  def assign_changed_fields_from_user
+    self.linkedin = trim_field(user.linkedin) if user.linkedin_changed?
+    self.twitter = trim_field(user.twitter) if user.twitter_changed?
+    self.skype = trim_field(user.skype) if user.skype_changed?
+    self.website_url = trim_field(user.website_url) if user.website_url_changed?
+    self.location = trim_field(user.location) if user.location_changed?
+    self.organization = trim_field(user.organization) if user.organization_changed?
+  end
+
   private
 
   def prevent_nil_bio
     self.bio = '' if bio_changed? && bio.nil?
   end
+
+  def trim_field(value)
+    return '' unless value
+
+    value.first(DEFAULT_FIELD_LENGTH)
+  end
 end
 
 UserDetail.prepend_mod_with('UserDetail')