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
Boxiang Sun
gitlab-ce
Commits
636bcebc
Commit
636bcebc
authored
Aug 01, 2018
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix handling of non-existent groups
parent
d26074c7
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
app/helpers/namespaces_helper.rb
app/helpers/namespaces_helper.rb
+3
-3
No files found.
app/helpers/namespaces_helper.rb
View file @
636bcebc
...
@@ -19,15 +19,15 @@ module NamespacesHelper
...
@@ -19,15 +19,15 @@ module NamespacesHelper
# group if one exists by that name to prevent duplicates.
# group if one exists by that name to prevent duplicates.
unless
extra_group
.
persisted?
unless
extra_group
.
persisted?
existing_group
=
Group
.
find_by
(
name:
extra_group
.
name
)
existing_group
=
Group
.
find_by
(
name:
extra_group
.
name
)
extra_group
=
existing_group
if
existing_group
extra_group
=
existing_group
if
existing_group
&
.
persisted?
end
end
if
Ability
.
allowed?
(
current_user
,
:read_group
,
extra_group
)
if
Ability
.
allowed?
(
current_user
,
:read_group
,
extra_group
)
selected
=
extra_group
.
id
if
selected
==
:extra_group
selected
=
extra_group
.
id
if
selected
==
:extra_group
groups
|=
[
extra_group
]
groups
|=
[
extra_group
]
else
selected
=
:current_user
end
end
selected
||=
:current_user
end
end
options
=
[]
options
=
[]
...
...
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