Commit 54294377 authored by Valery Sizov's avatar Valery Sizov

Fix autoloading issues for Geo constants

parent 4ba24381
...@@ -134,7 +134,7 @@ module EE ...@@ -134,7 +134,7 @@ module EE
end end
def next_unprocessed_event def next_unprocessed_event
@next_unprocessed_event ||= Geo::EventLog.next_unprocessed_event @next_unprocessed_event ||= ::Geo::EventLog.next_unprocessed_event
end end
def unprocessed_too_old? def unprocessed_too_old?
......
...@@ -13,7 +13,7 @@ module EE ...@@ -13,7 +13,7 @@ module EE
prepended do prepended do
include ::Gitlab::Geo::ReplicableModel include ::Gitlab::Geo::ReplicableModel
with_replicator Geo::LfsObjectReplicator with_replicator ::Geo::LfsObjectReplicator
scope :project_id_in, ->(ids) { joins(:projects).merge(::Project.id_in(ids)) } scope :project_id_in, ->(ids) { joins(:projects).merge(::Project.id_in(ids)) }
end end
......
...@@ -11,7 +11,7 @@ module EE ...@@ -11,7 +11,7 @@ module EE
STORE_COLUMN = :external_diff_store STORE_COLUMN = :external_diff_store
with_replicator Geo::MergeRequestDiffReplicator with_replicator ::Geo::MergeRequestDiffReplicator
has_one :merge_request_diff_detail, autosave: true, inverse_of: :merge_request_diff has_one :merge_request_diff_detail, autosave: true, inverse_of: :merge_request_diff
......
...@@ -9,7 +9,7 @@ module EE ...@@ -9,7 +9,7 @@ module EE
include ::Gitlab::Geo::ReplicableModel include ::Gitlab::Geo::ReplicableModel
include ::Gitlab::Geo::VerificationState include ::Gitlab::Geo::VerificationState
with_replicator Geo::PackageFileReplicator with_replicator ::Geo::PackageFileReplicator
end end
class_methods do class_methods do
......
...@@ -9,7 +9,7 @@ module EE ...@@ -9,7 +9,7 @@ module EE
include ::Gitlab::Geo::VerificationState include ::Gitlab::Geo::VerificationState
include FromUnion include FromUnion
with_replicator Geo::SnippetRepositoryReplicator with_replicator ::Geo::SnippetRepositoryReplicator
end end
class_methods do class_methods do
......
...@@ -9,7 +9,7 @@ module EE ...@@ -9,7 +9,7 @@ module EE
include ::Gitlab::Geo::ReplicableModel include ::Gitlab::Geo::ReplicableModel
include ::Gitlab::Geo::VerificationState include ::Gitlab::Geo::VerificationState
with_replicator Geo::TerraformStateVersionReplicator with_replicator ::Geo::TerraformStateVersionReplicator
scope :project_id_in, ->(ids) { joins(:terraform_state).where('terraform_states.project_id': ids) } scope :project_id_in, ->(ids) { joins(:terraform_state).where('terraform_states.project_id': ids) }
end end
......
...@@ -36,7 +36,7 @@ module EE ...@@ -36,7 +36,7 @@ module EE
private private
def log_geo_event(key) def log_geo_event(key)
Geo::CacheInvalidationEventStore.new(key_for(key)).create! ::Geo::CacheInvalidationEventStore.new(key_for(key)).create!
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment