Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
15b10c34
Commit
15b10c34
authored
May 03, 2018
by
Dylan Griffith
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Dont remove duplicates in Runner.owned_or_shared since its not necessary
parent
b8abe0c9
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
app/models/ci/runner.rb
app/models/ci/runner.rb
+4
-1
No files found.
app/models/ci/runner.rb
View file @
15b10c34
...
@@ -40,7 +40,10 @@ module Ci
...
@@ -40,7 +40,10 @@ module Ci
}
}
scope
:owned_or_shared
,
->
(
project_id
)
do
scope
:owned_or_shared
,
->
(
project_id
)
do
union
=
Gitlab
::
SQL
::
Union
.
new
([
belonging_to_project
(
project_id
),
belonging_to_parent_group_of_project
(
project_id
),
shared
])
union
=
Gitlab
::
SQL
::
Union
.
new
(
[
belonging_to_project
(
project_id
),
belonging_to_parent_group_of_project
(
project_id
),
shared
],
remove_duplicates:
false
)
from
(
"(
#{
union
.
to_sql
}
) ci_runners"
)
from
(
"(
#{
union
.
to_sql
}
) ci_runners"
)
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