diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-18 16:06:20 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-18 16:06:20 +0200 |
commit | 757e92d52eadd0fea43a4998e89f309f196c4396 (patch) | |
tree | 3e7fa8e9149c4eb8aed58d6a2aa7bae7c06f14b5 /app/helpers/search_helper.rb | |
parent | ffbbccb7ea3e3c667b4cfdeaeeedfbef0a5f190a (diff) | |
download | gitlab-ce-757e92d52eadd0fea43a4998e89f309f196c4396.tar.gz |
Prevent duplicate method names in helpers
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/helpers/search_helper.rb')
-rw-r--r-- | app/helpers/search_helper.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb index 20b50debb44..470a495f036 100644 --- a/app/helpers/search_helper.rb +++ b/app/helpers/search_helper.rb @@ -49,7 +49,7 @@ module SearchHelper # Autocomplete results for the current project, if it's defined def project_autocomplete if @project && @project.repository.exists? && @project.repository.root_ref - prefix = simple_sanitize(@project.name_with_namespace) + prefix = search_result_sanitize(@project.name_with_namespace) ref = @ref || @project.repository.root_ref [ @@ -74,7 +74,7 @@ module SearchHelper def groups_autocomplete(term, limit = 5) current_user.authorized_groups.search(term).limit(limit).map do |group| { - label: "group: #{simple_sanitize(group.name)}", + label: "group: #{search_result_sanitize(group.name)}", url: group_path(group) } end @@ -84,7 +84,7 @@ module SearchHelper def projects_autocomplete(term, limit = 5) current_user.authorized_projects.search_by_title(term).non_archived.limit(limit).map do |p| { - label: "project: #{simple_sanitize(p.name_with_namespace)}", + label: "project: #{search_result_sanitize(p.name_with_namespace)}", url: project_path(p) } end @@ -94,13 +94,13 @@ module SearchHelper def public_projects_autocomplete(term, limit = 5) Project.public_or_internal_only(current_user).search_by_title(term).non_archived.limit(limit).map do |p| { - label: "project: #{simple_sanitize(p.name_with_namespace)}", + label: "project: #{search_result_sanitize(p.name_with_namespace)}", url: project_path(p) } end end - def simple_sanitize(str) + def search_result_sanitize(str) Sanitize.clean(str) end end |