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
Kazuhiko Shiozaki
gitlab-ce
Commits
694768e5
Commit
694768e5
authored
Sep 11, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix 404 if Group guest visit empty group page
parent
0235c2a7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
app/controllers/groups_controller.rb
app/controllers/groups_controller.rb
+1
-1
app/models/ability.rb
app/models/ability.rb
+4
-0
No files found.
app/controllers/groups_controller.rb
View file @
694768e5
...
@@ -110,7 +110,7 @@ class GroupsController < ApplicationController
...
@@ -110,7 +110,7 @@ class GroupsController < ApplicationController
# Dont allow unauthorized access to group
# Dont allow unauthorized access to group
def
authorize_read_group!
def
authorize_read_group!
unless
projects
.
present?
or
can?
(
current_user
,
:
manage
_group
,
@group
)
unless
projects
.
present?
or
can?
(
current_user
,
:
read
_group
,
@group
)
return
render_404
return
render_404
end
end
end
end
...
...
app/models/ability.rb
View file @
694768e5
...
@@ -135,6 +135,10 @@ class Ability
...
@@ -135,6 +135,10 @@ class Ability
def
group_abilities
user
,
group
def
group_abilities
user
,
group
rules
=
[]
rules
=
[]
if
group
.
users
.
include?
(
user
)
rules
<<
:read_group
end
# Only group owner and administrators can manage group
# Only group owner and administrators can manage group
if
group
.
owners
.
include?
(
user
)
||
user
.
admin?
if
group
.
owners
.
include?
(
user
)
||
user
.
admin?
rules
<<
[
rules
<<
[
...
...
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