Merge branch 'rename_sanitize_in_check_task' into 'master'

Rename sanitize in check task

This is to prevent the name clash between `sanitize_helper.rb` method sanitize and the method used to check if env variable is set in rake task.

See merge request !1336
This commit is contained in:
Dmitriy Zaporozhets
2014-12-22 14:19:21 +00:00
+2 -2
View File
@@ -786,14 +786,14 @@ namespace :gitlab do
end
def sanitized_message(project)
if sanitize
if should_sanitize?
"#{project.namespace_id.to_s.yellow}/#{project.id.to_s.yellow} ... "
else
"#{project.name_with_namespace.yellow} ... "
end
end
def sanitize
def should_sanitize?
if ENV['SANITIZE'] == "true"
true
else