summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-06-02 21:25:01 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-06-02 21:25:01 +0300
commit5a064b0249922c4d82fb44ae9f3bcf230a3cbbd0 (patch)
treeb34b30d8becf9b0e88be498a27be0c5b131e25de
parent144212fba27b688d0e3a12ea6092c4f4c7b89da9 (diff)
downloadgitlab-ce-5a064b0249922c4d82fb44ae9f3bcf230a3cbbd0.tar.gz
Get group members only if group not nil
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/controllers/admin/projects_controller.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/admin/projects_controller.rb b/app/controllers/admin/projects_controller.rb
index 097d208f313..8c1f45ac01c 100644
--- a/app/controllers/admin/projects_controller.rb
+++ b/app/controllers/admin/projects_controller.rb
@@ -17,7 +17,10 @@ class Admin::ProjectsController < Admin::ApplicationController
end
def show
- @group_members = @group.members.order("group_access DESC").page(params[:group_members_page]).per(30)
+ if @group
+ @group_members = @group.members.order("group_access DESC").page(params[:group_members_page]).per(30)
+ end
+
@project_members = @project.users_projects.page(params[:project_members_page]).per(30)
end