summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests/index.html.haml
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-12-23 17:31:38 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-12-23 17:31:38 +0200
commit32eb5de510a7e32d9bb886595aa47d95dc00490f (patch)
tree849df585904ec0438b09f86df190b5db3b7facc7 /app/views/projects/merge_requests/index.html.haml
parent9a8ac2accc78f231fdf7ad7fd8b8bb405a24942b (diff)
downloadgitlab-ce-32eb5de510a7e32d9bb886595aa47d95dc00490f.tar.gz
One column issue/mr lists for project
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views/projects/merge_requests/index.html.haml')
-rw-r--r--app/views/projects/merge_requests/index.html.haml30
1 files changed, 13 insertions, 17 deletions
diff --git a/app/views/projects/merge_requests/index.html.haml b/app/views/projects/merge_requests/index.html.haml
index b93e0f9da3e..6a615266ca3 100644
--- a/app/views/projects/merge_requests/index.html.haml
+++ b/app/views/projects/merge_requests/index.html.haml
@@ -1,23 +1,19 @@
= render "projects/issues_nav"
-.row
- .col-md-3.responsive-side
- = render 'shared/project_filter', project_entities_path: project_merge_requests_path(@project),
- labels: true, redirect: 'merge_requests', entity: 'merge_request'
- .col-md-9
- .append-bottom-10
- = render 'projects/issuable_filter'
- .panel.panel-default
- %ul.well-list.mr-list
- = render @merge_requests
- - if @merge_requests.blank?
- %li
- .nothing-here-block No merge requests to show
- - if @merge_requests.present?
- .pull-right
- %span.cgray.pull-right #{@merge_requests.total_count} merge requests for this filter
+.merge-requests-holder
+ .append-bottom-10
+ = render 'projects/issuable_filter'
+ .panel.panel-default
+ %ul.well-list.mr-list
+ = render @merge_requests
+ - if @merge_requests.blank?
+ %li
+ .nothing-here-block No merge requests to show
+ - if @merge_requests.present?
+ .pull-right
+ %span.cgray.pull-right #{@merge_requests.total_count} merge requests for this filter
- = paginate @merge_requests, theme: "gitlab"
+ = paginate @merge_requests, theme: "gitlab"
:javascript
$(merge_requestsPage);