Skip to content
Snippets Groups Projects
Commit 88f5eb1d authored by Rémy Coutable's avatar Rémy Coutable
Browse files

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
parents ed81fb4c 66c7f5cb
No related branches found
No related tags found
No related merge requests found
Loading
@@ -490,7 +490,7 @@ class Project < ActiveRecord::Base
Loading
@@ -490,7 +490,7 @@ class Project < ActiveRecord::Base
end end
   
def import_url def import_url
if import_data && super if import_data && super.present?
import_url = Gitlab::UrlSanitizer.new(super, credentials: import_data.credentials) import_url = Gitlab::UrlSanitizer.new(super, credentials: import_data.credentials)
import_url.full_url import_url.full_url
else else
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment