summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Kozono <mkozono@gmail.com>2017-06-22 13:05:25 -0700
committerMichael Kozono <mkozono@gmail.com>2017-06-22 15:41:55 -0700
commitf533b937d4fc77356c08df027f13f15f831eff97 (patch)
tree826e0b2265c67e56ad33b71b2fd3625836e66817
parent826d5b7b511c422913e3e77ad5374f7bc5cc767d (diff)
downloadgitlab-ce-mk-fix-issue-34068.tar.gz
Fix 500 on create group failuresmk-fix-issue-34068
Fixes #34068
-rw-r--r--app/views/layouts/header/_new_dropdown.haml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/layouts/header/_new_dropdown.haml b/app/views/layouts/header/_new_dropdown.haml
index c7302414386..969c423b032 100644
--- a/app/views/layouts/header/_new_dropdown.haml
+++ b/app/views/layouts/header/_new_dropdown.haml
@@ -4,7 +4,7 @@
= icon('caret-down')
.dropdown-menu-nav.dropdown-menu-align-right
%ul
- - if @group
+ - if @group&.persisted?
- create_group_project = can?(current_user, :create_projects, @group)
- create_group_subgroup = can?(current_user, :create_subgroup, @group)
- if create_group_project || create_group_subgroup
@@ -18,7 +18,7 @@
%li.divider
%li.dropdown-bold-header GitLab
- - if @project && @project.persisted?
+ - if @project&.persisted?
- create_project_issue = can?(current_user, :create_issue, @project)
- merge_project = can?(current_user, :create_merge_request, @project) ? @project : (current_user && current_user.fork_of(@project))
- create_project_snippet = can?(current_user, :create_project_snippet, @project)