Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
e3cb6198
Commit
e3cb6198
authored
Jun 22, 2017
by
Michael Kozono
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix 500 on create group failures
Fixes #34068
parent
826d5b7b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
app/views/layouts/header/_new_dropdown.haml
app/views/layouts/header/_new_dropdown.haml
+2
-2
changelogs/unreleased/mk-fix-issue-34068.yml
changelogs/unreleased/mk-fix-issue-34068.yml
+4
-0
No files found.
app/views/layouts/header/_new_dropdown.haml
View file @
e3cb6198
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
=
icon
(
'caret-down'
)
=
icon
(
'caret-down'
)
.dropdown-menu-nav.dropdown-menu-align-right
.dropdown-menu-nav.dropdown-menu-align-right
%ul
%ul
-
if
@group
-
if
@group
&
.
persisted?
-
create_group_project
=
can?
(
current_user
,
:create_projects
,
@group
)
-
create_group_project
=
can?
(
current_user
,
:create_projects
,
@group
)
-
create_group_subgroup
=
can?
(
current_user
,
:create_subgroup
,
@group
)
-
create_group_subgroup
=
can?
(
current_user
,
:create_subgroup
,
@group
)
-
if
create_group_project
||
create_group_subgroup
-
if
create_group_project
||
create_group_subgroup
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
%li
.divider
%li
.divider
%li
.dropdown-bold-header
GitLab
%li
.dropdown-bold-header
GitLab
-
if
@project
&&
@project
.
persisted?
-
if
@project
&
.
persisted?
-
create_project_issue
=
can?
(
current_user
,
:create_issue
,
@project
)
-
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
))
-
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
)
-
create_project_snippet
=
can?
(
current_user
,
:create_project_snippet
,
@project
)
...
...
changelogs/unreleased/mk-fix-issue-34068.yml
0 → 100644
View file @
e3cb6198
---
title
:
Fix 500 when failing to create private group
merge_request
:
12394
author
:
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment