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

2013-02-18 12:46:45 +00:00 · 2013-02-18 12:46:45 +00:00 · 1481d1cfe0
parent 01a7250ba5 1734611181
commit 1481d1cfe0
2 changed files with 2 additions and 2 deletions
--- a/app/models/user.rb
+++ b/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?
--- a/app/views/profiles/show.html.haml
+++ b/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