Add latest changes from gitlab-org/gitlab@master

1 files changed, 1 insertions, 9 deletions

diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index 481e1807a78..3d55269e36f 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -257,7 +257,7 @@ class ApplicationSetting < ApplicationRecord
 
   validates :snippet_size_limit, numericality: { only_integer: true, greater_than: 0 }
 
-  validate :email_restrictions_regex_valid?
+  validates :email_restrictions, untrusted_regexp: true
 
   SUPPORTED_KEY_TYPES.each do |type|
     validates :"#{type}_key_restriction", presence: true, key_restriction: { type: type }
@@ -411,14 +411,6 @@ class ApplicationSetting < ApplicationRecord
     recaptcha_enabled || login_recaptcha_protection_enabled
   end
 
-  def email_restrictions_regex_valid?
-    return if email_restrictions.blank?
-
-    Gitlab::UntrustedRegexp.new(email_restrictions)
-  rescue RegexpError
-    errors.add(:email_restrictions, _('is not a valid regular expression'))
-  end
-
   private
 
   def parsed_grafana_url