Fix project creation without import

1 files changed, 7 insertions, 1 deletions

diff --git a/app/models/project.rb b/app/models/project.rb
index 16f189fd71f..8c747743813 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -76,7 +76,9 @@ class Project < ActiveRecord::Base
   validates_uniqueness_of :name, scope: :namespace_id
   validates_uniqueness_of :path, scope: :namespace_id
 
-  validates :import_url, format: { with: URI::regexp(%w(http https)), message: "should be a valid url" }
+  validates :import_url,
+    format: { with: URI::regexp(%w(http https)), message: "should be a valid url" },
+    if: :import?
 
   validate :check_limit, :repo_name
 
@@ -147,6 +149,10 @@ class Project < ActiveRecord::Base
     id && valid?
   end
 
+  def import?
+    import_url.present?
+  end
+
   def check_limit
     unless creator.can_create_project?
       errors[:base] << ("Your own projects limit is #{creator.projects_limit}! Please contact administrator to increase it")