Merge pull request #97 from Gazler/hompage_changes

Hompage changes
24pullrequests · Dec 2, 2012 · 849a84b · 849a84b
2 parents 23f3e7c + 72453a1
commit 849a84b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb
@@ -1,7 +1,5 @@
 class StaticController < ApplicationController
   def homepage
-    redirect_to dashboard_path if logged_in?
-
     @projects = Project.limit(200).sample(14).sort_by(&:name)
     @users = User.limit(200).sample(45)
     @pull_requests = PullRequest.order('created_at desc').limit(5)

diff --git a/app/views/static/homepage.html.haml b/app/views/static/homepage.html.haml
@@ -43,7 +43,7 @@
 .row-fluid.clearfix
   .span12
     %h3
-      Latest Pull Requests
+      Latest Pull Requests (#{PullRequest.count} total)
       = link_to 'View All', pull_requests_path, :class => 'btn pull-right'
 
   #pull_requests