diff options
author | Heinrich Lee Yu <heinrich@gitlab.com> | 2019-07-24 17:20:54 +0800 |
---|---|---|
committer | Heinrich Lee Yu <heinrich@gitlab.com> | 2019-07-25 15:35:06 +0800 |
commit | 1ce5bcacdbf56682e05fa63875203bf4d10584bc (patch) | |
tree | d46baea2e6f30ff63553f76624fe0b314227a732 /app/models | |
parent | ba997f3c428d94adfc9a2eb4eb0daaa3d759c4df (diff) | |
download | gitlab-ce-1ce5bcacdbf56682e05fa63875203bf4d10584bc.tar.gz |
Remove code related to object hierarchy in MySQLremove-nested-groups-checks
These are not required because MySQL is not
supported anymore
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/concerns/descendant.rb | 11 | ||||
-rw-r--r-- | app/models/group.rb | 1 | ||||
-rw-r--r-- | app/models/namespace.rb | 2 |
3 files changed, 0 insertions, 14 deletions
diff --git a/app/models/concerns/descendant.rb b/app/models/concerns/descendant.rb deleted file mode 100644 index 4c436522122..00000000000 --- a/app/models/concerns/descendant.rb +++ /dev/null @@ -1,11 +0,0 @@ -# frozen_string_literal: true - -module Descendant - extend ActiveSupport::Concern - - class_methods do - def supports_nested_objects? - Gitlab::Database.postgresql? - end - end -end diff --git a/app/models/group.rb b/app/models/group.rb index 26ce2957e9b..a8382c12603 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -10,7 +10,6 @@ class Group < Namespace include Referable include SelectForProjectAuthorization include LoadedInGroupList - include Descendant include GroupDescendant include TokenAuthenticatable include WithUploads diff --git a/app/models/namespace.rb b/app/models/namespace.rb index b8d7348268a..058350b16ce 100644 --- a/app/models/namespace.rb +++ b/app/models/namespace.rb @@ -332,8 +332,6 @@ class Namespace < ApplicationRecord end def force_share_with_group_lock_on_descendants - return unless Group.supports_nested_objects? - # We can't use `descendants.update_all` since Rails will throw away the WITH # RECURSIVE statement. We also can't use WHERE EXISTS since we can't use # different table aliases, hence we're just using WHERE IN. Since we have a |