summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-03-21 18:52:21 +0100
committerJames Lopez <james@jameslopez.es>2016-03-21 18:52:21 +0100
commit4196ee0661d705c81ca49294926bfaa28d725119 (patch)
tree63580b6c9f3f026436eedd610ae8660218bcf3d4
parent99f08b3f727e9d155ab10ad285fe48e0279fb79e (diff)
downloadgitlab-ce-4196ee0661d705c81ca49294926bfaa28d725119.tar.gz
update safe_import_url to prevent tokens to be showed by the UI
-rw-r--r--app/models/project.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index 148eab692ff..a9e93655a19 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -409,6 +409,7 @@ class Project < ActiveRecord::Base
def safe_import_url
result = URI.parse(self.import_url)
result.password = '*****' unless result.password.nil?
+ result.user = '*****' unless result.user.nil? || result.user == "git" #tokens or other data may be saved as user
result.to_s
rescue
self.import_url