diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-08 12:50:25 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-08 12:50:25 +0100 |
| commit | 3c80a543153f8f686ec99d2d04b181b2d2c8a665 (patch) | |
| tree | 679ca3921b00bd9e0904b4ad1be4e01d0a753ee9 /app/models/application_setting.rb | |
| parent | 1a942111653e9376d6275c5bd31f23cb27f58ab5 (diff) | |
| parent | f5430e48b42227f1c1874ca27c6907f0f704be28 (diff) | |
| download | gitlab-ce-3c80a543153f8f686ec99d2d04b181b2d2c8a665.tar.gz | |
Merge branch 'master' into ui/miscui/misc
Diffstat (limited to 'app/models/application_setting.rb')
| -rw-r--r-- | app/models/application_setting.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index 5ddcf3d9a0b..1880ad9f33c 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -43,12 +43,12 @@ class ApplicationSetting < ActiveRecord::Base validates :home_page_url, allow_blank: true, - format: { with: /\A#{URI.regexp(%w(http https))}\z/, message: "should be a valid url" }, + url: true, if: :home_page_url_column_exist validates :after_sign_out_path, allow_blank: true, - format: { with: /\A#{URI.regexp(%w(http https))}\z/, message: "should be a valid url" } + url: true validates :admin_notification_email, allow_blank: true, |