Add latest changes from gitlab-org/gitlab@master

1 files changed, 12 insertions, 0 deletions

diff --git a/app/models/namespace_setting.rb b/app/models/namespace_setting.rb
index 53bfa3d979e..40c46fa6e3d 100644
--- a/app/models/namespace_setting.rb
+++ b/app/models/namespace_setting.rb
@@ -3,7 +3,19 @@
 class NamespaceSetting < ApplicationRecord
   belongs_to :namespace, inverse_of: :namespace_settings
 
+  validate :default_branch_name_content
+
+  NAMESPACE_SETTINGS_PARAMS = [:default_branch_name].freeze
+
   self.primary_key = :namespace_id
+
+  def default_branch_name_content
+    return if default_branch_name.nil?
+
+    if default_branch_name.blank?
+      errors.add(:default_branch_name, "can not be an empty string")
+    end
+  end
 end
 
 NamespaceSetting.prepend_if_ee('EE::NamespaceSetting')