diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-11-16 13:24:36 +0100 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-11-16 13:24:56 +0100 |
commit | 03f5ff750b107b30a6d306aafb6699a9c9ecff0d (patch) | |
tree | c3f60a24f630435d946c66da93e7b05d6bb0296a /app | |
parent | 9179fcece813d0fe54abb5d7a28874cfa799f9c5 (diff) | |
download | gitlab-ce-03f5ff750b107b30a6d306aafb6699a9c9ecff0d.tar.gz |
Show specific runners from projects where user is master or ownerci-runners-master-or-owner
Diffstat (limited to 'app')
-rw-r--r-- | app/models/user.rb | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 9ffadcf4468..61abea1f6ea 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -405,6 +405,15 @@ class User < ActiveRecord::Base end end + def master_or_owner_projects_id + @master_or_owner_projects_id ||= begin + scope = { access_level: [ Gitlab::Access::MASTER, Gitlab::Access::OWNER ] } + project_ids = personal_projects.pluck(:id) + project_ids.push(*groups_projects.where(members: scope).pluck(:id)) + project_ids.push(*projects.where(members: scope).pluck(:id).uniq) + end + end + # Projects user has access to def authorized_projects @authorized_projects ||= Project.where(id: authorized_projects_id) @@ -765,14 +774,10 @@ class User < ActiveRecord::Base !solo_owned_groups.present? end - def ci_authorized_projects - @ci_authorized_projects ||= Ci::Project.where(gitlab_id: authorized_projects_id) - end - def ci_authorized_runners @ci_authorized_runners ||= begin runner_ids = Ci::RunnerProject.joins(:project). - where(ci_projects: { gitlab_id: authorized_projects_id }).select(:runner_id) + where(ci_projects: { gitlab_id: master_or_owner_projects_id }).select(:runner_id) Ci::Runner.specific.where(id: runner_ids) end end |