diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-02 09:56:24 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-02 09:56:24 +0300 |
| commit | f3b31c4c5bdf2470ee6625f01cd4741cdb319345 (patch) | |
| tree | ce50f4907ea70d8d2e297d4e9d9b1ac0591036ca /app | |
| parent | 4e1f9e2b8b14eeaabc8f2a779acc8c9d94f538f5 (diff) | |
| parent | 55cf6243a4959449d253003cff15d4e0978d08f9 (diff) | |
| download | gitlab-ce-f3b31c4c5bdf2470ee6625f01cd4741cdb319345.tar.gz | |
Merge pull request #6629 from sykano/fix-project-limit-for-groups
fix for project creation: group projects don't count towards user's project limit
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/project.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 33aa4e72fbc..f20581428dc 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -243,7 +243,7 @@ class Project < ActiveRecord::Base end def check_limit - unless creator.can_create_project? + unless creator.can_create_project? or namespace.kind == 'group' errors[:limit_reached] << ("Your project limit is #{creator.projects_limit} projects! Please contact your administrator to increase it") end rescue |