diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-02-19 09:00:36 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-02-19 09:00:36 +0000 |
| commit | a33b63b7d4f22a467763f6191af5696531d203e6 (patch) | |
| tree | 2587f1506f688d8b5bea0b76538f954fcb29f8b1 | |
| parent | ad12f11f3ed81637b4d72ce9e494fdbd1f26b1bb (diff) | |
| parent | 8dc800691861a35e322da367e27bedd48a2b71de (diff) | |
| download | gitlab-ce-a33b63b7d4f22a467763f6191af5696531d203e6.tar.gz | |
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
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/shared/_project_limit.html.haml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index b0d08d97226..4fe250efd42 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -64,6 +64,7 @@ v 8.5.0 (unreleased) - Fix broken link to project in build notification emails - Ability to see and sort on vote count from Issues and MR lists - Fix builds scheduler when first build in stage was allowed to fail + - User project limit is reached notice is hidden if the projects limit is zero v 8.4.4 - Update omniauth-saml gem to 1.4.2 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. |