summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorJarka Kadlecová <jarka@gitlab.com>2018-08-06 11:05:44 +0200
committerJarka Kadlecová <jarka@gitlab.com>2018-08-06 14:18:21 +0200
commit6dc7490789237a84b66baaaf4c6deea5ec3bf2de (patch)
tree0753dac4c896896eeae88a3aa0f92de433839e9f /app/models
parent02b077925dedca390be3e8c4c7960d89ea8d4c6e (diff)
downloadgitlab-ce-6dc7490789237a84b66baaaf4c6deea5ec3bf2de.tar.gz
Add changes from the EE
Diffstat (limited to 'app/models')
-rw-r--r--app/models/group.rb6
1 files changed, 0 insertions, 6 deletions
diff --git a/app/models/group.rb b/app/models/group.rb
index 28677320e28..084cae3101a 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -84,12 +84,6 @@ class Group < Namespace
where(id: user.authorized_groups.select(:id).reorder(nil))
end
- def public_or_visible_to_user(user)
- where('id IN (?) OR namespaces.visibility_level IN (?)',
- user.authorized_groups.select(:id),
- Gitlab::VisibilityLevel.levels_for_user(user))
- end
-
def select_for_project_authorization
if current_scope.joins_values.include?(:shared_projects)
joins('INNER JOIN namespaces project_namespace ON project_namespace.id = projects.namespace_id')