diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-02-18 12:46:45 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-02-18 12:46:45 +0000 |
| commit | 1481d1cfe08d875424aa59e2f3db7843cc56ab97 (patch) | |
| tree | a91f6507621a14eda41e43e9e85c130600e4f792 /app | |
| parent | 01a7250ba502c63681bf0060b2cbf1b2a28afac6 (diff) | |
| parent | 17346111819d8b920eb1d6bc9dbf41fe06a5404a (diff) | |
| download | gitlab-ce-1481d1cfe08d875424aa59e2f3db7843cc56ab97.tar.gz | |
Merge branch 'count_user_owned_projects' of /home/git/repositories/gitlab/gitlabhq
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/user.rb | 2 | ||||
| -rw-r--r-- | app/views/profiles/show.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 10af9b8c165..b39ee48505a 100644 --- 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? diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml index 3cf6330cc3c..9cab3ba5252 100644 --- 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 |