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/project.rb | |
| parent | 0c3f70acf4838194f517c02874b8423303c21b48 (diff) | |
| parent | 51ed5225adf4aac3ccbf715f8647258dac784abb (diff) | |
| download | gitlab-ce-ui/dashboard-new-issue.tar.gz | |
Merge branch 'master' into ui/dashboard-new-issueui/dashboard-new-issue
Diffstat (limited to 'app/models/project.rb')
| -rw-r--r-- | app/models/project.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 6010770a5f2..af034a6692b 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -152,7 +152,7 @@ class Project < ActiveRecord::Base validates_uniqueness_of :name, scope: :namespace_id validates_uniqueness_of :path, scope: :namespace_id validates :import_url, - format: { with: /\A#{URI.regexp(%w(ssh git http https))}\z/, message: 'should be a valid url' }, + url: { protocols: %w(ssh git http https) }, if: :external_import? validates :star_count, numericality: { greater_than_or_equal_to: 0 } validate :check_limit, on: :create |