Merge branch 'dz-nested-groups-access-improvements' into 'master'

Nested groups feature improvemetns

See merge request !8448

1 files changed, 9 insertions, 0 deletions

diff --git a/app/models/user.rb b/app/models/user.rb
index 2caa66dd9f7..54f5388eb2c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -439,6 +439,15 @@ class User < ActiveRecord::Base
     Group.where("namespaces.id IN (#{union.to_sql})")
   end
 
+  def nested_groups
+    Group.member_descendants(id)
+  end
+
+  def nested_projects
+    Project.joins(:namespace).where('namespaces.parent_id IS NOT NULL').
+      member_descendants(id)
+  end
+
   def refresh_authorized_projects
     Users::RefreshAuthorizedProjectsService.new(self).execute
   end