Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
A
Admin
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
osuny
Admin
Commits
b66181da
Unverified
Commit
b66181da
authored
10 months ago
by
Sébastien Gaya
Committed by
GitHub
10 months ago
Browse files
Options
Downloads
Patches
Plain Diff
indirect obj direct sources with deps (#1931)
parent
e34ed80e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/models/communication/website/with_git_repository.rb
+1
-22
1 addition, 22 deletions
app/models/communication/website/with_git_repository.rb
app/models/concerns/as_indirect_object.rb
+23
-0
23 additions, 0 deletions
app/models/concerns/as_indirect_object.rb
with
24 additions
and
22 deletions
app/models/communication/website/with_git_repository.rb
+
1
−
22
View file @
b66181da
...
@@ -35,14 +35,9 @@ module Communication::Website::WithGitRepository
...
@@ -35,14 +35,9 @@ module Communication::Website::WithGitRepository
# Synchronisation optimale d'objet indirect
# Synchronisation optimale d'objet indirect
def
sync_indirect_object_with_git
(
indirect_object
)
def
sync_indirect_object_with_git
(
indirect_object
)
all_dependencies
=
[]
indirect_object
.
direct_sources_with_dependencies
.
each
do
|
dependency
|
indirect_object
.
direct_sources
.
each
do
|
direct_source
|
all_dependencies
=
add_direct_source_to_sync
(
direct_source
,
array:
all_dependencies
)
end
all_dependencies
.
each
do
|
dependency
|
Communication
::
Website
::
GitFile
.
sync
self
,
dependency
Communication
::
Website
::
GitFile
.
sync
self
,
dependency
end
end
git_repository
.
sync!
git_repository
.
sync!
end
end
...
@@ -93,20 +88,4 @@ module Communication::Website::WithGitRepository
...
@@ -93,20 +88,4 @@ module Communication::Website::WithGitRepository
git_repository
.
update_theme_version!
git_repository
.
update_theme_version!
end
end
protected
def
add_direct_source_to_sync
(
direct_source
,
array:
[])
# Ne pas traiter les sources d'autres sites
return
array
unless
direct_source
.
website
.
id
==
self
.
id
# Ne pas traiter les sources non synchronisables
return
array
unless
direct_source
.
syncable?
# Ne pas traiter si la source directe est déjà dans le tableau de dépendances
return
array
if
array
.
include?
(
direct_source
)
array
<<
direct_source
# On passe le tableau de dépendances à la méthode recursive_dependencies
# pour qu'il soit capable d'early return en cas de doublon
array
+=
direct_source
.
recursive_dependencies
(
array:
array
,
syncable_only:
true
)
# On ne synchronise pas les références de l'objet direct, car on ne le modifie pas lui.
array
end
end
end
This diff is collapsed.
Click to expand it.
app/models/concerns/as_indirect_object.rb
+
23
−
0
View file @
b66181da
...
@@ -52,6 +52,14 @@ module AsIndirectObject
...
@@ -52,6 +52,14 @@ module AsIndirectObject
connections
.
collect
&
:direct_source
connections
.
collect
&
:direct_source
end
end
def
direct_sources_with_dependencies
dependencies
=
[]
direct_sources
.
each
do
|
direct_source
|
dependencies
=
add_direct_source_to_dependencies
(
direct_source
,
array:
dependencies
)
end
dependencies
end
protected
protected
def
direct_sources_from_reference
(
reference
)
def
direct_sources_from_reference
(
reference
)
...
@@ -70,4 +78,19 @@ module AsIndirectObject
...
@@ -70,4 +78,19 @@ module AsIndirectObject
end
end
end
end
def
add_direct_source_to_dependencies
(
direct_source
,
array:
[])
# Ne pas traiter les sources d'autres sites
return
array
unless
direct_source
.
website
.
id
==
self
.
id
# Ne pas traiter les sources non synchronisables
return
array
unless
direct_source
.
syncable?
# Ne pas traiter si la source directe est déjà dans le tableau de dépendances
return
array
if
array
.
include?
(
direct_source
)
array
<<
direct_source
# On passe le tableau de dépendances à la méthode recursive_dependencies
# pour qu'il soit capable d'early return en cas de doublon
array
+=
direct_source
.
recursive_dependencies
(
array:
array
,
syncable_only:
true
)
# On ne synchronise pas les références de l'objet direct, car on ne le modifie pas lui.
array
end
end
end
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment