diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-06-23 18:44:49 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-06-23 18:44:49 +0000 |
| commit | 788f54152be78fc1e7af01b92f83e6db00736fad (patch) | |
| tree | 0cc39d2c4ffa8fd0c2f0a225b80d860a7dbf1597 | |
| parent | a4c81b6416b3b6cb852de2716240accf0d7f99eb (diff) | |
| parent | e3cb61985de0d6ec85bce06134ed59eee806d009 (diff) | |
| download | gitlab-ce-788f54152be78fc1e7af01b92f83e6db00736fad.tar.gz | |
Merge branch 'mk-fix-issue-34068' into 'master'
Fix 500 on failure to create a private group
Closes #34068
See merge request !12394
| -rw-r--r-- | app/views/layouts/header/_new_dropdown.haml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/mk-fix-issue-34068.yml | 4 |
2 files changed, 6 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) diff --git a/changelogs/unreleased/mk-fix-issue-34068.yml b/changelogs/unreleased/mk-fix-issue-34068.yml new file mode 100644 index 00000000000..af0a9139568 --- /dev/null +++ b/changelogs/unreleased/mk-fix-issue-34068.yml @@ -0,0 +1,4 @@ +--- +title: Fix 500 when failing to create private group +merge_request: 12394 +author: |