dashboard v1

app/controllers/dashboard_controller.rb

@@ -1,6 +1,37 @@
 class DashboardController < ApplicationController
+  respond_to :js, :html
+
   def index
     @projects = current_user.projects.all
     @active_projects = @projects.select(&:last_activity_date).sort_by(&:last_activity_date).reverse
+
+    respond_to do |format|
+      format.html
+      format.js { no_cache_headers }
+    end
+  end
+
+  def merge_requests
+    @projects = current_user.projects.all
+    @merge_requests = current_user.assigned_merge_requests.order("created_at DESC").limit(40)
+
+    respond_to do |format|
+      format.html
+      format.js { no_cache_headers }
+    end
+  end
+
+  def issues
+    @projects = current_user.projects.all
+    @user   = current_user
+    @issues = current_user.assigned_issues.opened.order("created_at DESC").limit(40)
+
+    @issues = @issues.includes(:author, :project)
+
+    respond_to do |format|
+      format.html
+      format.js { no_cache_headers }
+      format.atom { render :layout => false }
+    end
   end
 end

app/controllers/user_issues_controller.rb

@@ -1,20 +0,0 @@
-class UserIssuesController < ApplicationController
-  before_filter :authenticate_user!
-
-  respond_to :js, :html
-
-  def index
-    @projects = current_user.projects.all
-    @user   = current_user
-    @issues = current_user.assigned_issues.opened
-
-    @issues = @issues.includes(:author, :project)
-
-    respond_to do |format|
-      format.html
-      format.js
-      format.atom { render :layout => false }
-    end
-  end
-
-end

app/controllers/user_merge_requests_controller.rb

@@ -1,8 +0,0 @@
-class UserMergeRequestsController < ApplicationController
-  before_filter :authenticate_user!
-
-  def index
-    @projects = current_user.projects.all
-    @merge_requests = current_user.assigned_merge_requests
-  end
-end