deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-02-18 12:46:45 +00:00
commit 1481d1cfe0
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/user.rb
View file

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

2
app/views/profiles/show.html.haml
View file

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