diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-06 07:14:50 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-06 07:14:50 -0700 |
| commit | 470f9064facd7a5452947ea7d3b650ea885c2195 (patch) | |
| tree | ab3d74d5b33442a22297852752e6535bbc145415 /app/models/user.rb | |
| parent | cf9a366e22f731118b19de8a9922fb8df20e86a3 (diff) | |
| parent | 86a262de1af7f34629276f584a7af45fcd08b871 (diff) | |
| download | gitlab-ce-470f9064facd7a5452947ea7d3b650ea885c2195.tar.gz | |
Merge pull request #4206 from babatakao/authorize_all_teams_to_admin
Authorize all teams to admin: fix 500 error on showing team page.
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index a1244f9a489..3f51d7a9938 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -247,8 +247,12 @@ class User < ActiveRecord::Base end def authorized_teams - @team_ids ||= (user_teams.pluck(:id) + own_teams.pluck(:id)).uniq - UserTeam.where(id: @team_ids) + if admin? + UserTeam.scoped + else + @team_ids ||= (user_teams.pluck(:id) + own_teams.pluck(:id)).uniq + UserTeam.where(id: @team_ids) + end end # Team membership in authorized projects |