summaryrefslogtreecommitdiff
path: root/app/models/user.rb
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-07-19 13:19:04 -0600
committerRobert Speicher <rspeicher@gmail.com>2016-07-19 13:19:04 -0600
commit17bac49154a399d34e7b884551d2fb78dff3cea3 (patch)
treeda79715b73c92f41f4696122563db2782bff7766 /app/models/user.rb
parent1d7ac1641e50938c854abf249c53e51ce1ef2ed5 (diff)
downloadgitlab-ce-17bac49154a399d34e7b884551d2fb78dff3cea3.tar.gz
Ensure Owners are included in the scope for authorized_projects
Prior, when providing a `min_access_level` parameter to this method, we called `Gitlab::Access.values` instead of `all_values`, mistakenly omitting the `OWNER` level. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19878
Diffstat (limited to 'app/models/user.rb')
-rw-r--r--app/models/user.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index 3d0a033785c..975e935fa20 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -854,7 +854,7 @@ class User < ActiveRecord::Base
groups.joins(:shared_projects).select(:project_id)]
if min_access_level
- scope = { access_level: Gitlab::Access.values.select { |access| access >= min_access_level } }
+ scope = { access_level: Gitlab::Access.all_values.select { |access| access >= min_access_level } }
relations = [relations.shift] + relations.map { |relation| relation.where(members: scope) }
end