Merge branch 'issue_dashboard' into improved_dashboard

app/controllers/user_issues_controller.rb

@@ -0,0 +1,21 @@
+class UserIssuesController < ApplicationController
+  before_filter :authenticate_user!
+
+  layout "user"
+
+  respond_to :js, :html
+
+  def index
+    @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

@@ -0,0 +1,9 @@
+class UserMergeRequestsController < ApplicationController
+  before_filter :authenticate_user!
+
+  layout "user"
+
+  def index
+    @merge_requests = current_user.assigned_merge_requests
+  end
+end