diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2015-10-20 17:12:23 +0200 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2015-10-20 17:12:23 +0200 |
| commit | e4008bc415c112db6b2200fb9c79431ad4ffbecc (patch) | |
| tree | ecedd7a4db93e1cdcebfed0c9afa194fbee30078 /app/models/application_setting.rb | |
| parent | a321404fde85fba6b09cbf1a56914f3a2ae555e4 (diff) | |
| parent | befff6827a2cf81f6565b99212652a70139aa2b6 (diff) | |
| download | gitlab-ce-git-archive-improvements-2.tar.gz | |
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-archive-improvements-2git-archive-improvements-2
Diffstat (limited to 'app/models/application_setting.rb')
| -rw-r--r-- | app/models/application_setting.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index c8841178e93..05430c2ee18 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -44,6 +44,10 @@ class ApplicationSetting < ActiveRecord::Base allow_blank: true, format: { with: /\A#{URI.regexp(%w(http https))}\z/, message: "should be a valid url" } + validates :admin_notification_email, + allow_blank: true, + email: true + validates_each :restricted_visibility_levels do |record, attr, value| unless value.nil? value.each do |level| |