diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-24 14:08:12 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-24 14:08:12 +0000 |
| commit | 5c5a02da31b13e99ca5be5c9f619a4be9b2ab7d6 (patch) | |
| tree | bc13e2750fd8c1f3929ced0ab881f3a75990d6da | |
| parent | 0f0a96ab2e8da425dcdf4952427d6665f80f78d0 (diff) | |
| parent | 1817b9aec424388b3667b4a744dd1288eec3560f (diff) | |
| download | gitlab-ce-5c5a02da31b13e99ca5be5c9f619a4be9b2ab7d6.tar.gz | |
Merge branch 'fix-namespace-select' into 'master'
Fix namespace select
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/371
| -rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 8c2045444f0..63d819a0f36 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -372,7 +372,7 @@ class User < ActiveRecord::Base end def several_namespaces? - owned_groups.any? + owned_groups.any? || masters_groups.any? end def namespace_id |