Merge branch 'feature/all_merge_requets' of /home/git/repositories/gitlab/gitlabhq

4 files changed, 17 insertions, 5 deletions

diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml
index 82880d5ef63..bda5b7c9147 100644
--- a/app/views/dashboard/issues.html.haml
+++ b/app/views/dashboard/issues.html.haml
@@ -1,9 +1,9 @@
 %h3.page-title
-  Issues assigned to me
+  Issues
   %span.pull-right #{@issues.total_count} issues
 
 %p.light
-  For all issues you should visit the project's issues page, or use the search panel to find a specific issue.
+  List all issues from all project's you have access to.
 %hr
 
 .row
diff --git a/app/views/dashboard/merge_requests.html.haml b/app/views/dashboard/merge_requests.html.haml
index 9c96edeefd5..74d02336bb8 100644
--- a/app/views/dashboard/merge_requests.html.haml
+++ b/app/views/dashboard/merge_requests.html.haml
@@ -4,7 +4,7 @@
 
 
 %p.light
-  Only merge requests created by you or assigned to you are listed here.
+  List all merge requests from all project's you have access to.
 %hr
 .row
   .span3
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index cae24c3170d..12fd49e609f 100644
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
@@ -12,7 +12,7 @@
   = nav_link(path: 'dashboard#merge_requests') do
     = link_to merge_requests_dashboard_path do
       Merge Requests
-      %span.count= current_user.cared_merge_requests.opened.count
+      %span.count= current_user.assigned_merge_requests.opened.count
   = nav_link(controller: :help) do
     = link_to "Help", help_path
 
diff --git a/app/views/shared/_filter.html.haml b/app/views/shared/_filter.html.haml
index 2f051cea48b..d48a8d6c1dd 100644
--- a/app/views/shared/_filter.html.haml
+++ b/app/views/shared/_filter.html.haml
@@ -1,5 +1,17 @@
 = form_tag filter_path(entity), method: 'get' do
-  %fieldset
+  %fieldset.scope-filter
+    %ul.nav.nav-pills.nav-stacked
+      %li{class: ("active" if params[:scope].blank?)}
+        = link_to filter_path(entity, scope: nil) do
+          Assigned to me
+      %li{class: ("active" if params[:scope] == 'authored')}
+        = link_to filter_path(entity, scope: 'authored') do
+          Authored by me
+      %li{class: ("active" if params[:scope] == 'all')}
+        = link_to filter_path(entity, scope: 'all') do
+          All
+
+  %fieldset.status-filter
     %ul.nav.nav-pills.nav-stacked
       %li{class: ("active" if params[:status].blank?)}
         = link_to filter_path(entity, status: nil) do