Merge branch 'count_user_owned_projects' of /home/git/repositories/gitlab/gitlabhq

app/models/user.rb

@@ -235,7 +235,7 @@ class User < ActiveRecord::Base
   end
 
   def can_create_project?
-    projects_limit > personal_projects.count
+    projects_limit > owned_projects.count
   end
 
   def can_create_group?

app/views/profiles/show.html.haml

@@ -77,7 +77,7 @@
         %legend
           Personal projects:
           %small.pull-right
-            %span= current_user.personal_projects.count
+            %span= current_user.owned_projects.count
             of
             %span= current_user.projects_limit
         .padded