diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-11-06 23:43:10 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-11-06 23:43:10 +0900 |
| commit | b4d167a8f78509e241639e560ee1fed545d2dbc1 (patch) | |
| tree | ad31164a4fe19d7c3dbc7d9e9f1d3ee6e3e65637 /app/finders/groups_finder.rb | |
| parent | c5377b97968ba9edefe7766dac77cc9fbbaa4e2c (diff) | |
| parent | d4ceec9d47a7da5fa17cb6e161ac491e13fcb8bd (diff) | |
| download | gitlab-ce-b4d167a8f78509e241639e560ee1fed545d2dbc1.tar.gz | |
Merge branch 'master' into feature/sm/3691-expose-per-project-pipeline-idfeature/sm/3691-expose-per-project-pipeline-id
Diffstat (limited to 'app/finders/groups_finder.rb')
| -rw-r--r-- | app/finders/groups_finder.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/finders/groups_finder.rb b/app/finders/groups_finder.rb index 88d71b0a87b..0c4c4b10fb6 100644 --- a/app/finders/groups_finder.rb +++ b/app/finders/groups_finder.rb @@ -57,7 +57,7 @@ class GroupsFinder < UnionFinder end def owned_groups - current_user&.groups || Group.none + current_user&.owned_groups || Group.none end def include_public_groups? |