summaryrefslogtreecommitdiff
path: root/app/models/project_group_link.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-31 12:08:33 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-31 12:08:33 +0000
commit1808454313ed75c92e1384466e8c83bfbc8ae25e (patch)
tree5c006c158fd796dc6d21e9bd771542f2fb0c24e2 /app/models/project_group_link.rb
parentfd3a95f07ae9cd78fecffcfa5de4494f933a7808 (diff)
downloadgitlab-ce-1808454313ed75c92e1384466e8c83bfbc8ae25e.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/project_group_link.rb')
-rw-r--r--app/models/project_group_link.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/project_group_link.rb b/app/models/project_group_link.rb
index b70c07a8386..bc16a34612a 100644
--- a/app/models/project_group_link.rb
+++ b/app/models/project_group_link.rb
@@ -31,6 +31,10 @@ class ProjectGroupLink < ApplicationRecord
DEVELOPER
end
+ def self.search(query)
+ joins(:group).merge(Group.search(query))
+ end
+
def human_access
self.class.access_options.key(self.group_access)
end