diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-08 15:22:04 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-08 15:22:04 +0100 |
| commit | 15925290eec4f5616e12ef3169794f85150e3270 (patch) | |
| tree | b1adb5784f74a05491a38b8656e179f451b79e5e /app/models/application_setting.rb | |
| parent | 0c3f70acf4838194f517c02874b8423303c21b48 (diff) | |
| parent | 51ed5225adf4aac3ccbf715f8647258dac784abb (diff) | |
| download | gitlab-ce-15925290eec4f5616e12ef3169794f85150e3270.tar.gz | |
Merge branch 'master' into ui/dashboard-new-issueui/dashboard-new-issue
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, |