BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
73f302ed
Commit
73f302ed
authored
Nov 18, 2015
by
Yorick Peterse
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply CI scope changes to the User model
These changes are based on those from commit
03f5ff75
, except they use a UNION instead of plucking IDs into memory.
parent
fbdf3767
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
6 deletions
+10
-6
user.rb
app/models/user.rb
+10
-6
No files found.
app/models/user.rb
View file @
73f302ed
...
...
@@ -770,15 +770,10 @@ class User < ActiveRecord::Base
!
solo_owned_groups
.
present?
end
def
ci_authorized_projects
@ci_authorized_projects
||=
Ci
::
Project
.
where
(
"gitlab_id IN (
#{
projects_union
.
to_sql
}
)"
)
end
def
ci_authorized_runners
@ci_authorized_runners
||=
begin
runner_ids
=
Ci
::
RunnerProject
.
joins
(
:project
).
where
(
"ci_projects.gitlab_id IN (
#{
projects_union
.
to_sql
}
)"
).
where
(
"ci_projects.gitlab_id IN (
#{
ci_
projects_union
.
to_sql
}
)"
).
select
(
:runner_id
)
Ci
::
Runner
.
specific
.
where
(
id:
runner_ids
)
...
...
@@ -792,4 +787,13 @@ class User < ActiveRecord::Base
groups_projects
.
select
(
:id
),
projects
.
select
(
:id
)])
end
def
ci_projects_union
scope
=
{
access_level:
[
Gitlab
::
Access
::
MASTER
,
Gitlab
::
Access
::
OWNER
]
}
groups
=
groups_projects
.
where
(
members:
scope
)
other
=
projects
.
where
(
members:
scope
)
Gitlab
::
SQL
::
Union
.
new
([
personal_projects
.
select
(
:id
),
groups
.
select
(
:id
),
other
.
select
(
:id
)])
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment