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
cbe5d29b
Commit
cbe5d29b
authored
Apr 29, 2019
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename geo_syncable to syncable
parent
6ca2bca0
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
ee/app/finders/geo/job_artifact_registry_finder.rb
ee/app/finders/geo/job_artifact_registry_finder.rb
+4
-4
ee/app/finders/geo/legacy_job_artifact_registry_finder.rb
ee/app/finders/geo/legacy_job_artifact_registry_finder.rb
+1
-1
ee/app/models/ee/ci/job_artifact.rb
ee/app/models/ee/ci/job_artifact.rb
+1
-1
ee/app/models/geo/fdw/ci/job_artifact.rb
ee/app/models/geo/fdw/ci/job_artifact.rb
+1
-1
No files found.
ee/app/finders/geo/job_artifact_registry_finder.rb
View file @
cbe5d29b
...
...
@@ -38,9 +38,9 @@ module Geo
if
use_legacy_queries_for_selective_sync?
legacy_finder
.
syncable
elsif
selective_sync?
job_artifacts
.
geo_
syncable
job_artifacts
.
syncable
else
Ci
::
JobArtifact
.
geo_
syncable
Ci
::
JobArtifact
.
syncable
end
end
...
...
@@ -157,13 +157,13 @@ module Geo
def
fdw_find
job_artifacts
.
inner_join_job_artifact_registry
.
geo_
syncable
.
syncable
end
def
fdw_find_unsynced
(
except_artifact_ids
:)
job_artifacts
.
missing_job_artifact_registry
.
geo_
syncable
.
syncable
.
id_not_in
(
except_artifact_ids
)
end
...
...
ee/app/finders/geo/legacy_job_artifact_registry_finder.rb
View file @
cbe5d29b
...
...
@@ -3,7 +3,7 @@
module
Geo
class
LegacyJobArtifactRegistryFinder
<
RegistryFinder
def
syncable
job_artifacts
.
geo_
syncable
job_artifacts
.
syncable
end
def
job_artifacts
...
...
ee/app/models/ee/ci/job_artifact.rb
View file @
cbe5d29b
...
...
@@ -16,8 +16,8 @@ module EE
METRICS_REPORT_FILE_TYPES
=
%w[metrics]
.
freeze
scope
:not_expired
,
->
{
where
(
'expire_at IS NULL OR expire_at > ?'
,
Time
.
current
)
}
scope
:geo_syncable
,
->
{
with_files_stored_locally
.
not_expired
}
scope
:project_id_in
,
->
(
ids
)
{
joins
(
:project
).
merge
(
::
Project
.
id_in
(
ids
))
}
scope
:syncable
,
->
{
with_files_stored_locally
.
not_expired
}
scope
:with_files_stored_remotely
,
->
{
where
(
file_store:
::
JobArtifactUploader
::
Store
::
REMOTE
)
}
scope
:security_reports
,
->
do
...
...
ee/app/models/geo/fdw/ci/job_artifact.rb
View file @
cbe5d29b
...
...
@@ -13,8 +13,8 @@ module Geo
belongs_to
:project
,
class_name:
'Geo::Fdw::Project'
,
inverse_of: :job_artifacts
scope
:not_expired
,
->
{
where
(
'expire_at IS NULL OR expire_at > ?'
,
Time
.
current
)
}
scope
:geo_syncable
,
->
{
with_files_stored_locally
.
not_expired
}
scope
:project_id_in
,
->
(
ids
)
{
joins
(
:project
).
merge
(
Geo
::
Fdw
::
Project
.
id_in
(
ids
))
}
scope
:syncable
,
->
{
with_files_stored_locally
.
not_expired
}
class
<<
self
def
inner_join_job_artifact_registry
...
...
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