gitlab-org--gitlab-foss/app/views/search/_result.html.haml

63 lines
2 KiB
Text
Raw Normal View History

2013-01-25 03:07:21 -05:00
%fieldset
%legend
Search results
%span.cgray (#{@total_results})
2013-05-09 04:27:14 -04:00
- if @project
%ul.nav.nav-pills
%li{class: ("active" if params[:search_code].present?)}
= link_to search_path(params.merge(search_code: true)) do
Repository Code
%li{class: ("active" if params[:search_code].blank?)}
= link_to search_path(params.merge(search_code: nil)) do
Everything else
.search_results
2013-05-09 04:27:14 -04:00
%ul.bordered-list
2013-01-25 03:07:21 -05:00
- @projects.each do |project|
%li
project:
= link_to project do
%strong.term= project.name_with_namespace
- @merge_requests.each do |merge_request|
%li
merge request:
Merge Request on forked projects The good: - You can do a merge request for a forked commit and it will merge properly (i.e. it does work). - Push events take into account merge requests on forked projects - Tests around merge_actions now present, spinach, and other rspec tests - Satellites now clean themselves up rather then recreate The questionable: - Events only know about target projects - Project's merge requests only hold on to MR's where they are the target - All operations performed in the satellite The bad: - Duplication between project's repositories and satellites (e.g. commits_between) (for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos) Fixes: Make test repos/satellites only create when needed -Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap) -project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually -fixed remote removal -How to merge renders properly -Update emails to show project/branches -Edit MR doesn't set target branch -Fix some failures on editing/creating merge requests, added a test -Added back a test around merge request observer -Clean up project_transfer_spec, Remove duplicate enable/disable observers -Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well -Signifant speed ups for tests -Update formatting ordering in notes_on_merge_requests -Remove wiki schema update Fixes for search/search results -Search results was using by_project for a list of projects, updated this to use in_projects -updated search results to reference the correct (target) project -udpated search results to print both sides of the merge request Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8
2013-04-25 10:15:33 -04:00
= link_to [merge_request.target_project, merge_request] do
2013-01-25 03:07:21 -05:00
%span ##{merge_request.id}
%strong.term
= truncate merge_request.title, length: 50
- if merge_request.for_fork?
%span.light (#{merge_request.source_project.name_with_namespace}:#{merge_request.source_branch} → #{merge_request.target_project.name_with_namespace}:#{merge_request.target_branch})
- else
%span.light (#{merge_request.source_branch} → #{merge_request.target_branch})
2013-08-15 04:51:40 -04:00
- if merge_request.closed?
%span.label Closed
2013-01-25 03:07:21 -05:00
- @issues.each do |issue|
%li
issue:
= link_to [issue.project, issue] do
%span ##{issue.id}
%strong.term
= truncate issue.title, length: 50
%span.light (#{issue.project.name_with_namespace})
2013-08-15 04:51:40 -04:00
- if issue.closed?
%span.label Closed
2013-01-25 03:07:21 -05:00
- @wiki_pages.each do |wiki_page|
%li
wiki:
= link_to project_wiki_path(wiki_page.project, wiki_page) do
%strong.term
= truncate wiki_page.title, length: 50
%span.light (#{wiki_page.project.name_with_namespace})
- @blobs.each do |blob|
= render 'blob', blob: blob
= paginate @blobs, theme: 'gitlab'
2013-01-25 03:07:21 -05:00
:javascript
2013-06-21 15:08:16 -04:00
$(".search_results .term").highlight("#{escape_javascript(params[:search])}");
2012-03-15 19:14:39 -04:00