diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-07-18 07:38:19 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-07-18 07:38:19 +0000 |
| commit | a95a32f03c517276898383774d70e9cfe01bd71e (patch) | |
| tree | 981f80b5e7be7b860cddacc6178d50dd425a243f /app | |
| parent | 65352b5baaf269a609b024fd13efc81e8bbdcefa (diff) | |
| parent | 7a72c75a9cfeb2793e68e55ef091c1c298f27832 (diff) | |
| download | gitlab-ce-a95a32f03c517276898383774d70e9cfe01bd71e.tar.gz | |
Merge branch 'allow-blank-import-url' into 'master'
Allow a project import URL to be blank to prevent false positives in validation
Projects that happen to have blank import URLs were failing validation, causing project settings not to be saved. Loosen the requirement and don't try to use the import data if the URL isn't present.
Closes #19893
See merge request !5309
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/project.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index e7b9835692d..d3ae4a2dd0b 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -162,7 +162,7 @@ class Project < ActiveRecord::Base validates :namespace, presence: true validates_uniqueness_of :name, scope: :namespace_id validates_uniqueness_of :path, scope: :namespace_id - validates :import_url, addressable_url: true, if: :import_url + validates :import_url, addressable_url: true, if: :external_import? validates :star_count, numericality: { greater_than_or_equal_to: 0 } validate :check_limit, on: :create validate :avatar_type, @@ -482,7 +482,7 @@ class Project < ActiveRecord::Base end def create_or_update_import_data(data: nil, credentials: nil) - return unless valid_import_url? + return unless import_url.present? && valid_import_url? project_import_data = import_data || build_import_data if data |