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

Fix namespace select Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/371

Merge branch 'fix-namespace-select' into 'master'
5c5a02da · Dmitriy Zaporozhets · 0f0a96ab · 1817b9ae · 5c5a02da
Commit 5c5a02da authored Jun 24, 2014 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

user.rb app/models/user.rb +1 -1

No files found.
--- 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