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

1481d1cf · Dmitriy Zaporozhets · 01a7250b · 17346111 · 1481d1cf · 1481d1cf
Commit 1481d1cf authored Feb 18, 2013 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

app/models/user.rb app/models/user.rb +1 -1

app/views/profiles/show.html.haml app/views/profiles/show.html.haml +1 -1

No files found.
--- 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