Commit 5b091c76 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #5512 from jhollingsworth/feature/missing-group-500-fix

Fixes 500 error when user types in wrong group name.
parents 0f665f41 dfe19b2b
...@@ -6,6 +6,7 @@ v 6.3.0 ...@@ -6,6 +6,7 @@ v 6.3.0
- Show branches list (which branches contains commit) on commit page (Andrew Kumanyaev) - Show branches list (which branches contains commit) on commit page (Andrew Kumanyaev)
- Security improvements - Security improvements
- Added support for GitLab CI 4.0 - Added support for GitLab CI 4.0
- Fixed issue with 500 error when group did not exist
v 6.2.0 v 6.2.0
- Public project pages are now visible to everyone (files, issues, wik, etc.) - Public project pages are now visible to everyone (files, issues, wik, etc.)
......
...@@ -102,7 +102,7 @@ class GroupsController < ApplicationController ...@@ -102,7 +102,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, :read_group, @group) unless @group and (projects.present? or can?(current_user, :read_group, @group))
return render_404 return render_404
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment