Add latest changes from gitlab-org/gitlab@master

2 files changed, 83 insertions, 14 deletions

diff --git a/app/models/user.rb b/app/models/user.rb
index ea7a9cd5742..939b5430769 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -58,16 +58,16 @@ class User < ApplicationRecord
   add_authentication_token_field :feed_token
   add_authentication_token_field :static_object_token, encrypted: :optional
 
-  default_value_for :admin, false
-  default_value_for(:external) { Gitlab::CurrentSettings.user_default_external }
-  default_value_for(:can_create_group) { Gitlab::CurrentSettings.can_create_group }
-  default_value_for :can_create_team, false
-  default_value_for :hide_no_ssh_key, false
-  default_value_for :hide_no_password, false
-  default_value_for :project_view, :files
-  default_value_for :notified_of_own_activity, false
-  default_value_for :preferred_language, I18n.default_locale
-  default_value_for :theme_id, gitlab_config.default_theme
+  attribute :admin, default: false
+  attribute :external, default: -> { Gitlab::CurrentSettings.user_default_external }
+  attribute :can_create_group, default: -> { Gitlab::CurrentSettings.can_create_group }
+  attribute :can_create_team, default: false
+  attribute :hide_no_ssh_key, default: false
+  attribute :hide_no_password, default: false
+  attribute :project_view, default: :files
+  attribute :notified_of_own_activity, default: false
+  attribute :preferred_language, default: -> { I18n.default_locale }
+  attribute :theme_id, default: -> { gitlab_config.default_theme }
 
   attr_encrypted :otp_secret,
     key: Gitlab::Application.secrets.otp_key_base,
@@ -376,6 +376,14 @@ class User < ApplicationRecord
   accepts_nested_attributes_for :credit_card_validation, update_only: true, allow_destroy: true
 
   state_machine :state, initial: :active do
+    # state_machine uses this method at class loading time to fetch the default
+    # value for the `state` column but in doing so it also evaluates all other
+    # columns default values which could trigger the recursive generation of
+    # ApplicationSetting records. We're setting it to `nil` here because we
+    # don't have a database default for the `state` column.
+    #
+    def owner_class_attribute_default; end
+
     event :block do
       transition active: :blocked
       transition deactivated: :blocked
diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb
index c6ebd550daf..bc2c6b526b8 100644
--- a/app/models/user_preference.rb
+++ b/app/models/user_preference.rb
@@ -26,10 +26,10 @@ class UserPreference < ApplicationRecord
 
   ignore_columns :experience_level, remove_with: '14.10', remove_after: '2021-03-22'
 
-  default_value_for :tab_width, value: Gitlab::TabWidth::DEFAULT, allows_nil: false
-  default_value_for :time_display_relative, value: true, allows_nil: false
-  default_value_for :time_format_in_24h, value: false, allows_nil: false
-  default_value_for :render_whitespace_in_code, value: false, allows_nil: false
+  attribute :tab_width, default: -> { Gitlab::TabWidth::DEFAULT }
+  attribute :time_display_relative, default: true
+  attribute :time_format_in_24h, default: false
+  attribute :render_whitespace_in_code, default: false
 
   class << self
     def notes_filters
@@ -59,6 +59,67 @@ class UserPreference < ApplicationRecord
     self[notes_filter_field_for(resource)]
   end
 
+  def tab_width
+    read_attribute(:tab_width) || self.class.column_defaults['tab_width']
+  end
+
+  def tab_width=(value)
+    if value.nil?
+      default = self.class.column_defaults['tab_width']
+      super(default)
+    else
+      super(value)
+    end
+  end
+
+  def time_display_relative
+    value = read_attribute(:time_display_relative)
+    return value unless value.nil?
+
+    self.class.column_defaults['time_display_relative']
+  end
+
+  def time_display_relative=(value)
+    if value.nil?
+      default = self.class.column_defaults['time_display_relative']
+      super(default)
+    else
+      super(value)
+    end
+  end
+
+  def time_format_in_24h
+    value = read_attribute(:time_format_in_24h)
+    return value unless value.nil?
+
+    self.class.column_defaults['time_format_in_24h']
+  end
+
+  def time_format_in_24h=(value)
+    if value.nil?
+      default = self.class.column_defaults['time_format_in_24h']
+      super(default)
+    else
+      super(value)
+    end
+  end
+
+  def render_whitespace_in_code
+    value = read_attribute(:render_whitespace_in_code)
+    return value unless value.nil?
+
+    self.class.column_defaults['render_whitespace_in_code']
+  end
+
+  def render_whitespace_in_code=(value)
+    if value.nil?
+      default = self.class.column_defaults['render_whitespace_in_code']
+      super(default)
+    else
+      super(value)
+    end
+  end
+
   private
 
   def notes_filter_field_for(resource)