diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-03 17:54:33 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-03 17:54:33 -0800 |
| commit | 635ebac606d77eae03ce2e2a8f0a814ad4c79177 (patch) | |
| tree | 8f3047074880166e53edb987df8ba4295d374c3d /app/models/application_setting.rb | |
| parent | ac7af45d8987422c2a529d3d87eae6d9bd608e12 (diff) | |
| parent | 704922c855a9741b5495db56ac266788a9c25c33 (diff) | |
| download | gitlab-ce-635ebac606d77eae03ce2e2a8f0a814ad4c79177.tar.gz | |
Merge branch 'master' into mwessel/gitlab-ce-configure-protection
Diffstat (limited to 'app/models/application_setting.rb')
| -rw-r--r-- | app/models/application_setting.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index 3285a1a248e..6d4e220b16c 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -15,7 +15,8 @@ # class ApplicationSetting < ActiveRecord::Base - validates :home_page_url, allow_blank: true, + validates :home_page_url, + allow_blank: true, format: { with: URI::regexp(%w(http https)), message: "should be a valid url" }, if: :home_page_url_column_exist |