diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-10-14 18:10:45 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-10-14 18:10:45 +0000 |
| commit | 88f5eb1d01b9490ca5fe6757e1085a4dc0964c1e (patch) | |
| tree | 04326ac29be536bf53fe87260588a8fcac6e4672 | |
| parent | ed81fb4cb5fd679e97e7b88c0ed2e7d7b461007b (diff) | |
| parent | 66c7f5cb46d446a1c6c89ba888efd9e5f74f876d (diff) | |
| download | gitlab-ce-88f5eb1d01b9490ca5fe6757e1085a4dc0964c1e.tar.gz | |
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
| -rw-r--r-- | app/models/project.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index ea0daa47424..db3088677d8 100644 --- 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 |