diff options
author | Robert Speicher <robert@gitlab.com> | 2016-05-25 23:38:14 +0300 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-05-25 23:38:14 +0300 |
commit | 380966e861a3c0cfc1d2884939c6677599690206 (patch) | |
tree | 111c576974f92aa81bb59df7080c94b2d2ce4d6d /app | |
parent | 49343f9a31ffdcf4ff238189bbf58e581e41d102 (diff) | |
parent | 497a28c59f042fcce36d1d0682cf225c9743369f (diff) |
Merge branch 'zero-project-creation-error-message' into 'master'
Updated error message when project limit is zero
When the project limit is zero & the user tries to create a project, the
error displayed is now 'Personal project creation is not allowed. Please
contact your administrator with questions'
Closes #17691
See merge request !4280
Diffstat (limited to 'app')
-rw-r--r-- | app/models/project.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 37de1dfe4d5..f3a56b86d5a 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -431,7 +431,13 @@ class Project < ActiveRecord::Base def check_limit unless creator.can_create_project? or namespace.kind == 'group' - self.errors.add(:limit_reached, "Your project limit is #{creator.projects_limit} projects! Please contact your administrator to increase it") + projects_limit = creator.projects_limit + + if projects_limit == 0 + self.errors.add(:limit_reached, "Personal project creation is not allowed. Please contact your administrator with questions") + else + self.errors.add(:limit_reached, "Your project limit is #{projects_limit} projects! Please contact your administrator to increase it") + end end rescue self.errors.add(:base, "Can't check your ability to create project") |