Merge branch 'fix/mirror-update-error' into 'master'

Fix empty import URL errors CE version of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/780 See merge request !6693

Merge branch 'fix/mirror-update-error' into 'master'
88f5eb1d · Rémy Coutable · ed81fb4c · 66c7f5cb · 88f5eb1d
Commit 88f5eb1d authored Oct 14, 2016 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

project.rb app/models/project.rb +1 -1

No files found.
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -490,7 +490,7 @@ class Project < ActiveRecord::Base
  end

  def import_url
-    if import_data && super
+    if import_data && super.present?
      import_url = Gitlab::UrlSanitizer.new(super, credentials: import_data.credentials)
      import_url.full_url
    else