summaryrefslogtreecommitdiff
path: root/app/models/project.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-12-20 12:49:25 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-12-20 12:49:25 +0000
commit24c9e1e2a85651cd5e446c1f848dad64f3981493 (patch)
tree9e42c15bedc4977a8639919069ebe184f2836c44 /app/models/project.rb
parent8b32eb6477bcabf5e15885579ae5c43a41b508de (diff)
parentb1c39553859bb1f5f830fa759f2202462fe24d98 (diff)
downloadgitlab-ce-24c9e1e2a85651cd5e446c1f848dad64f3981493.tar.gz
Merge branch 'ce-8333-add-related-epics-support' into 'master'
CE port: Rename GroupHierarchy into ObjectHierarchy See merge request gitlab-org/gitlab-ce!23923
Diffstat (limited to 'app/models/project.rb')
-rw-r--r--app/models/project.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index e4b8db860a4..9ba478a535c 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -570,7 +570,7 @@ class Project < ActiveRecord::Base
# returns all ancestor-groups upto but excluding the given namespace
# when no namespace is given, all ancestors upto the top are returned
def ancestors_upto(top = nil, hierarchy_order: nil)
- Gitlab::GroupHierarchy.new(Group.where(id: namespace_id))
+ Gitlab::ObjectHierarchy.new(Group.where(id: namespace_id))
.base_and_ancestors(upto: top, hierarchy_order: hierarchy_order)
end