Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-02-19 12:00:36 +0300
committerRémy Coutable <remy@rymai.me>2016-02-19 18:30:34 +0300
commit105f12c33a1120c62d3bd09ebf3081d68ed6744f (patch)
tree6bb08c4743de0bb41c88a93d4548000ce2261efe /app
parentda0953e65273b1346567dff09518c3eeb7463c6f (diff)
Merge branch '12791-hide-project-limit-reached-warning' into 'master'
Project limit is reached warning is hidden when the projects_limit is zero Fixes #12791 See merge request !2890
Diffstat (limited to 'app')
-rw-r--r--app/views/shared/_project_limit.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/shared/_project_limit.html.haml b/app/views/shared/_project_limit.html.haml
index 960ff00b49d..f4eb8e491b9 100644
--- a/app/views/shared/_project_limit.html.haml
+++ b/app/views/shared/_project_limit.html.haml
@@ -1,4 +1,4 @@
-- if cookies[:hide_project_limit_message].blank? && !current_user.hide_project_limit && !current_user.can_create_project?
+- if cookies[:hide_project_limit_message].blank? && !current_user.hide_project_limit && !current_user.can_create_project? && current_user.projects_limit > 0
.project-limit-message.alert.alert-warning.hidden-xs
You won't be able to create new projects because you have reached your project limit.