diff options
author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-12-22 14:19:21 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-12-22 14:19:21 +0000 |
commit | 602fd68dc194fd47dbeb88b56d5db7eee04472a0 (patch) | |
tree | f2e21bec5337db7eda2c5d3e6fc50b5c48543264 | |
parent | 55319c0a7aa0dbcdf3a8b73fc60447a353c5beec (diff) | |
parent | 18d9172edc3bb3a1cfd7640ea0555e887ce5bde5 (diff) | |
download | gitlab-ce-602fd68dc194fd47dbeb88b56d5db7eee04472a0.tar.gz |
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
-rw-r--r-- | lib/tasks/gitlab/check.rake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index 1da5f4b980f..43115915de1 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -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 |