diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-07 20:48:57 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-07 20:52:43 +0200 |
| commit | cc64f2a814802abe9ae3bb8297079b643c8774df (patch) | |
| tree | 5eb20bceb48b9f81093e8734907fe4c9f7b40ada /app/views/groups/merge_requests.html.haml | |
| parent | 0a1603992490d47b3fe676a02dedb5417603a1f2 (diff) | |
| download | gitlab-ce-cc64f2a814802abe9ae3bb8297079b643c8774df.tar.gz | |
Common filtering for dashboard and group. Share partial search result partial
Diffstat (limited to 'app/views/groups/merge_requests.html.haml')
| -rw-r--r-- | app/views/groups/merge_requests.html.haml | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/app/views/groups/merge_requests.html.haml b/app/views/groups/merge_requests.html.haml index 5fac4828526..c5245da731a 100644 --- a/app/views/groups/merge_requests.html.haml +++ b/app/views/groups/merge_requests.html.haml @@ -3,17 +3,22 @@ %small (authored by or assigned to you) %small.right #{@merge_requests.total_count} merge requests -%br -- if @merge_requests.any? - - @merge_requests.group_by(&:project).each do |group| - %ul.well-list.ui-box - - @project = group[0] - %h5.title - = @project.name - - group[1].each do |merge_request| - = render(partial: 'merge_requests/merge_request', locals: {merge_request: merge_request}) - %hr - = paginate @merge_requests, theme: "gitlab" +%hr +.row + .span3 + = render 'filter', entity: 'merge_request' + .span9 + - if @merge_requests.any? + - @merge_requests.group_by(&:project).each do |group| + .ui-box + - @project = group[0] + %h5.title + = link_to_project @project + %ul.well-list + - group[1].each do |merge_request| + = render(partial: 'merge_requests/merge_request', locals: {merge_request: merge_request}) + %hr + = paginate @merge_requests, theme: "gitlab" -- else - %h3.nothing_here_message Nothing to show here + - else + %h3.nothing_here_message Nothing to show here |