mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-25 20:46:12 +10:00
Apply user project limit only for personal projects. We should not include group projects for user limit
This commit is contained in:
+2
-2
@@ -294,12 +294,12 @@ class User < ActiveRecord::Base
|
||||
end
|
||||
|
||||
def projects_limit_left
|
||||
projects_limit - owned_projects.count
|
||||
projects_limit - personal_projects.count
|
||||
end
|
||||
|
||||
def projects_limit_percent
|
||||
return 100 if projects_limit.zero?
|
||||
(owned_projects.count.to_f / projects_limit) * 100
|
||||
(personal_projects.count.to_f / projects_limit) * 100
|
||||
end
|
||||
|
||||
def recent_push project_id = nil
|
||||
|
||||
@@ -70,9 +70,9 @@
|
||||
- unless current_user.projects_limit_left > 100
|
||||
%fieldset
|
||||
%legend
|
||||
Owned projects:
|
||||
Personal projects:
|
||||
%small.pull-right
|
||||
%span= current_user.owned_projects.count
|
||||
%span= current_user.personal_projects.count
|
||||
of
|
||||
%span= current_user.projects_limit
|
||||
.padded
|
||||
|
||||
Reference in New Issue
Block a user