diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-05-14 20:25:16 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-05-14 20:25:16 +0300 |
| commit | 9d9b78823d151970fd784b995da2be1a5155b581 (patch) | |
| tree | c0f85dd35fac0419ecb9863577ae79c127cb3d59 /app/views/search | |
| parent | 46daf01a155b68fb1cda270881aa1f6c8307e830 (diff) | |
| download | gitlab-ce-9d9b78823d151970fd784b995da2be1a5155b581.tar.gz | |
Fix paginate of blobs, fixed preserve in dev mode for blob results
Diffstat (limited to 'app/views/search')
| -rw-r--r-- | app/views/search/_blob.html.haml | 3 | ||||
| -rw-r--r-- | app/views/search/_result.html.haml | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/search/_blob.html.haml b/app/views/search/_blob.html.haml index 39e71170706..8b5efa8f622 100644 --- a/app/views/search/_blob.html.haml +++ b/app/views/search/_blob.html.haml @@ -7,4 +7,5 @@ = blob.filename .file_content.code.term %div{class: user_color_scheme_class} - = raw blob.colorize( formatter: :gitlab, options: { first_line_number: blob.startline } ) + = preserve do + = raw blob.colorize( formatter: :gitlab, options: { first_line_number: blob.startline } ) diff --git a/app/views/search/_result.html.haml b/app/views/search/_result.html.haml index 23f6646fba2..4d8caa5e70c 100644 --- a/app/views/search/_result.html.haml +++ b/app/views/search/_result.html.haml @@ -1,7 +1,7 @@ %fieldset %legend Search results - %span.cgray (#{@projects.count + @merge_requests.count + @issues.count + @wiki_pages.count + @blobs.total_count}) + %span.cgray (#{@total_results}) - if @project %ul.nav.nav-pills @@ -12,7 +12,6 @@ = link_to search_path(params.merge(search_code: nil)) do Everything else - .search_results %ul.bordered-list - @projects.each do |project| |