diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-08-08 13:22:09 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-08-08 13:22:09 +0400 |
| commit | 4537623d12fb7372262267be5d6ec3b41f3f476c (patch) | |
| tree | ccd0494b1112c388114e032f994505a2344123be /app/views/shared/_merge_requests.html.haml | |
| parent | c7e490ebd5ab69fe043cd39145bd6ef3850a6921 (diff) | |
| parent | 1a83fea711961844adc7ddb21ce007143fefc144 (diff) | |
Merge branch 'master' into karlhungus-mr-on-fork
Conflicts:
app/contexts/filter_context.rb
app/contexts/search_context.rb
app/models/merge_request.rb
app/models/note.rb
app/views/shared/_merge_requests.html.haml
spec/controllers/commit_controller_spec.rb
spec/services/notification_service_spec.rb
Diffstat (limited to 'app/views/shared/_merge_requests.html.haml')
| -rw-r--r-- | app/views/shared/_merge_requests.html.haml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/views/shared/_merge_requests.html.haml b/app/views/shared/_merge_requests.html.haml index 5276f4bae31..4be445e6a32 100644 --- a/app/views/shared/_merge_requests.html.haml +++ b/app/views/shared/_merge_requests.html.haml @@ -1,13 +1,12 @@ - if @merge_requests.any? - @merge_requests.group_by(&:target_project).each do |group| - .ui-box + .ui-box.small-box - project = group[0] .title = link_to_project project %ul.well-list.mr-list - group[1].each do |merge_request| = render 'projects/merge_requests/merge_request', merge_request: merge_request - %hr = paginate @merge_requests, theme: "gitlab" - else |