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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
74099f52
Commit
74099f52
authored
May 21, 2020
by
Aleksei Lipniagov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update EE method declaration: use `class_methods`
parent
28c572e6
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
ee/app/models/ee/ci/runner.rb
ee/app/models/ee/ci/runner.rb
+3
-1
ee/app/models/ee/project.rb
ee/app/models/ee/project.rb
+1
-1
No files found.
ee/app/models/ee/ci/runner.rb
View file @
74099f52
...
@@ -3,6 +3,8 @@
...
@@ -3,6 +3,8 @@
module
EE
module
EE
module
Ci
module
Ci
module
Runner
module
Runner
extend
ActiveSupport
::
Concern
def
tick_runner_queue
def
tick_runner_queue
::
Gitlab
::
Database
::
LoadBalancing
::
Sticking
.
stick
(
:runner
,
id
)
::
Gitlab
::
Database
::
LoadBalancing
::
Sticking
.
stick
(
:runner
,
id
)
...
@@ -28,7 +30,7 @@ module EE
...
@@ -28,7 +30,7 @@ module EE
end
end
end
end
class
<<
self
class
_methods
do
def
has_shared_runners_with_non_zero_public_cost?
def
has_shared_runners_with_non_zero_public_cost?
Rails
.
cache
.
fetch
(
:shared_runners_public_cost_factor
,
expires_in:
1
.
hour
)
do
Rails
.
cache
.
fetch
(
:shared_runners_public_cost_factor
,
expires_in:
1
.
hour
)
do
::
Ci
::
Runner
.
instance_type
.
where
(
'public_projects_minutes_cost_factor > 0'
).
exists?
::
Ci
::
Runner
.
instance_type
.
where
(
'public_projects_minutes_cost_factor > 0'
).
exists?
...
...
ee/app/models/ee/project.rb
View file @
74099f52
...
@@ -94,7 +94,7 @@ module EE
...
@@ -94,7 +94,7 @@ module EE
scope
:with_shared_runners_limit_enabled
,
->
do
scope
:with_shared_runners_limit_enabled
,
->
do
if
::
Feature
.
enabled?
(
:ci_minutes_enforce_quota_for_public_projects
)
&&
if
::
Feature
.
enabled?
(
:ci_minutes_enforce_quota_for_public_projects
)
&&
::
EE
::
Ci
::
Runner
.
has_shared_runners_with_non_zero_public_cost?
::
Ci
::
Runner
.
has_shared_runners_with_non_zero_public_cost?
with_shared_runners
with_shared_runners
else
else
with_shared_runners
.
non_public_only
with_shared_runners
.
non_public_only
...
...
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