diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-23 12:23:08 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-23 12:23:08 +0000 |
| commit | ba0d4877934349603e24125864c3a46eba271e0e (patch) | |
| tree | 3debde710f9d85bc978001c245260ec826c0fe82 /app/models/user.rb | |
| parent | 6f7ce372921a322c48e659d8382a04895fd29b1f (diff) | |
| parent | 2ea5ef0ba4ee00b5551b88a6b9a68e045bf4b3f4 (diff) | |
| download | gitlab-ce-ba0d4877934349603e24125864c3a46eba271e0e.tar.gz | |
Merge branch 'fix/drop-project-authorized-for-user' into 'master'
Use authorized projects in ProjectTeam
Closes #23938 and #23636
See merge request !7586
Diffstat (limited to 'app/models/user.rb')
| -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 29fb849940a..223d84ba916 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -926,7 +926,7 @@ class User < ActiveRecord::Base # Returns a union query of projects that the user is authorized to access def project_authorizations_union relations = [ - personal_projects.select("#{id} AS user_id, projects.id AS project_id, #{Gitlab::Access::OWNER} AS access_level"), + personal_projects.select("#{id} AS user_id, projects.id AS project_id, #{Gitlab::Access::MASTER} AS access_level"), groups_projects.select_for_project_authorization, projects.select_for_project_authorization, groups.joins(:shared_projects).select_for_project_authorization |