summaryrefslogtreecommitdiff
path: root/app/models/project.rb
diff options
context:
space:
mode:
authorRubén Dávila <rdavila84@gmail.com>2016-05-18 13:17:32 -0500
committerRubén Dávila <rdavila84@gmail.com>2016-05-18 13:17:32 -0500
commit42635966281faa2ca79376c02c01976dc5c8047f (patch)
treea66065c7a0b56a5cd7d9e3dfd7fe019a22be58b9 /app/models/project.rb
parent28eea9bdfd0b28ad044f76bd4fcf988329ca9921 (diff)
downloadgitlab-ce-issue_17560.tar.gz
Mask credentials from URL when import of project has failed.issue_17560
Diffstat (limited to 'app/models/project.rb')
-rw-r--r--app/models/project.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index a3c4f1d8e9b..b464335597d 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -376,14 +376,14 @@ class Project < ActiveRecord::Base
end
def import_url=(value)
- import_url = Gitlab::ImportUrl.new(value)
+ import_url = Gitlab::UrlSanitizer.new(value)
create_or_update_import_data(credentials: import_url.credentials)
super(import_url.sanitized_url)
end
def import_url
if import_data && super
- import_url = Gitlab::ImportUrl.new(super, credentials: import_data.credentials)
+ import_url = Gitlab::UrlSanitizer.new(super, credentials: import_data.credentials)
import_url.full_url
else
super