Merge branch 'fix-namespace-select' into 'master'

Fix namespace select Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/371
2014-06-24 14:08:12 +00:00 · 2014-06-24 14:08:12 +00:00 · 5c5a02da31
commit 5c5a02da31
parent 0f0a96ab2e 1817b9aec4
1 changed files with 1 additions and 1 deletions
--- 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