Merge branch 'fix/url-refactor-from-ee' into 'master'

Update CE code to include some refactor done in EE to do with import url This is simply updating the code to match EE and avoid further conflicts related to `import_data` and `import_url` changes made on EE only. See merge request !4223

Merge branch 'fix/url-refactor-from-ee' into 'master'
5d031c86 · Robert Speicher · c5a5d548 · 341c1181 · 5d031c86
Commit 5d031c86 authored May 20, 2016 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 8 deletions

project.rb app/models/project.rb +3 -8

No files found.
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -204,7 +204,7 @@ class Project < ActiveRecord::Base
    state :finished
    state :failed

-    after_transition any => :finished, do: :clear_import_data
+    after_transition any => :finished, do: :reset_cache_and_import_attrs
  end

  class << self
@@ -360,7 +360,7 @@ class Project < ActiveRecord::Base
    end
  end

-  def clear_import_data
+  def reset_cache_and_import_attrs
    update(import_error: nil)

    ProjectCacheWorker.perform_async(self.id)
@@ -426,12 +426,7 @@ class Project < ActiveRecord::Base
  end

  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
+    Gitlab::UrlSanitizer.new(import_url).masked_url
  end

  def check_limit