summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorJason Hollingsworth <Jason.M.Hollingsworth@erdc.dren.mil>2013-11-01 11:29:37 -0500
committerJason Hollingsworth <Jason.M.Hollingsworth@erdc.dren.mil>2013-11-01 11:29:37 -0500
commitdfe19b2b84498af2eb0c7e401fda8f9eddfd0f46 (patch)
tree803d609e410727b08c9b032da5c9668f8c327dba /app/controllers
parent4c47a89fa5db6ccfcc9ae21fbfd7bb94b427b313 (diff)
downloadgitlab-ce-dfe19b2b84498af2eb0c7e401fda8f9eddfd0f46.tar.gz
Fixes 500 error when user types in wrong group name.
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/groups_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index f80167da4cb..bb46af14d52 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -102,7 +102,7 @@ class GroupsController < ApplicationController
# Dont allow unauthorized access to 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
end
end