diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-16 13:44:50 +0100 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-16 13:44:50 +0100 |
| commit | 40104746d6418b54cd80726d77c05e85cf2ddbb3 (patch) | |
| tree | aaa9bd256a8fefc7fb9dfcbe123dc869550dfb71 /app/models/application_setting.rb | |
| parent | 5ffed49fef07a06f46f7e4e3511d7f6b9f378892 (diff) | |
| parent | 907209821590efc34b11b60a042c6554bd11897f (diff) | |
| download | gitlab-ce-40104746d6418b54cd80726d77c05e85cf2ddbb3.tar.gz | |
Merge remote-tracking branch 'origin/feature/update-rubocop'
Diffstat (limited to 'app/models/application_setting.rb')
| -rw-r--r-- | app/models/application_setting.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index faa0bdf840b..1f4e8b3ef24 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -126,12 +126,12 @@ class ApplicationSetting < ActiveRecord::Base def restricted_signup_domains_raw=(values) self.restricted_signup_domains = [] self.restricted_signup_domains = values.split( - /\s*[,;]\s* # comma or semicolon, optionally surrounded by whitespace - | # or - \s # any whitespace character - | # or - [\r\n] # any number of newline characters - /x) + /\s*[,;]\s* # comma or semicolon, optionally surrounded by whitespace + | # or + \s # any whitespace character + | # or + [\r\n] # any number of newline characters + /x) self.restricted_signup_domains.reject! { |d| d.empty? } end end |