diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-01-11 02:52:25 +0300 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-01-28 01:20:18 +0300 |
| commit | aeb9db6753cfdd56f82d80c0e2c01f63d65b705d (patch) | |
| tree | 07dd8fea47384355ae52e6943bd15267b4765ee3 /app/views/shared/_merge_requests.html.haml | |
| parent | ac66268443b05029cbc45cc358f62b764f1ff165 (diff) | |
Present group and dashboard MR list without grouping by project
Diffstat (limited to 'app/views/shared/_merge_requests.html.haml')
| -rw-r--r-- | app/views/shared/_merge_requests.html.haml | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/app/views/shared/_merge_requests.html.haml b/app/views/shared/_merge_requests.html.haml index 2f3605b4d27..773f71802c0 100644 --- a/app/views/shared/_merge_requests.html.haml +++ b/app/views/shared/_merge_requests.html.haml @@ -1,16 +1,8 @@ - if @merge_requests.to_a.any? - - @merge_requests.group_by(&:target_project).each do |group| - .panel.panel-default.panel-small - - project = group[0] - .panel-heading - = link_to project.name_with_namespace, namespace_project_merge_requests_path(project.namespace, project) - - if can?(current_user, :create_merge_request, project) - .pull-right - = link_to 'New merge request', new_namespace_project_merge_request_path(project.namespace, project) + .panel.panel-default.panel-small + %ul.content-list.mr-list + = render partial: 'projects/merge_requests/merge_request', collection: @merge_requests - %ul.content-list.mr-list - - group[1].each do |merge_request| - = render 'projects/merge_requests/merge_request', merge_request: merge_request = paginate @merge_requests, theme: "gitlab" - else |