diff options
author | Stan Hu <stanhu@gmail.com> | 2016-07-17 20:12:32 -0700 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2016-07-17 20:12:32 -0700 |
commit | 565b3a183978a7952ef92d2e1e05b429f38322fa (patch) | |
tree | c1687093d614f63e06c88420998dcb7a7a8e3281 | |
parent | 1bf57b75119deb79f5826245d4c69a0a83cc4864 (diff) | |
download | gitlab-ce-565b3a183978a7952ef92d2e1e05b429f38322fa.tar.gz |
Allow a project import URL to be blank to prevent false positives
preventing settings from being saved
-rw-r--r-- | app/models/project.rb | 4 | ||||
-rw-r--r-- | spec/models/project_spec.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index e7b9835692d..8d71e01103c 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: "import_url.present?" 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 diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index e842c58dd82..9dc34276f18 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -142,10 +142,10 @@ describe Project, models: true do expect(project2).to be_valid end - it 'does not allow to introduce an empty URI' do + it 'allows an empty URI' do project2 = build(:project, import_url: '') - expect(project2).not_to be_valid + expect(project2).to be_valid end it 'does not produce import data on an empty URI' do |