kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

refactor project to include some nicer EE stuff

Browse source
This commit is contained in:
James Lopez 2016-05-20 14:55:27 +02:00
parent f26389a02a
commit 341c1181d9
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/models/project.rb
View file

@ -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