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
a1c88bdf
Commit
a1c88bdf
authored
Apr 17, 2019
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make Rubocop happy
parent
67eac408
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
ee/app/finders/geo/legacy_attachment_registry_finder.rb
ee/app/finders/geo/legacy_attachment_registry_finder.rb
+4
-2
No files found.
ee/app/finders/geo/legacy_attachment_registry_finder.rb
View file @
a1c88bdf
...
@@ -6,6 +6,7 @@ module Geo
...
@@ -6,6 +6,7 @@ module Geo
attachments
.
geo_syncable
attachments
.
geo_syncable
end
end
# rubocop:disable CodeReuse/ActiveRecord
def
attachments
def
attachments
if
selective_sync?
if
selective_sync?
Upload
.
where
(
group_uploads
.
or
(
project_uploads
).
or
(
other_uploads
))
Upload
.
where
(
group_uploads
.
or
(
project_uploads
).
or
(
other_uploads
))
...
@@ -13,10 +14,11 @@ module Geo
...
@@ -13,10 +14,11 @@ module Geo
Upload
.
all
Upload
.
all
end
end
end
end
# rubocop:enable CodeReuse/ActiveRecord
private
private
# rubocop:
disable CodeReuse/ActiveRecord
# rubocop:disable CodeReuse/ActiveRecord
def
group_uploads
def
group_uploads
namespace_ids
=
namespace_ids
=
if
current_node
.
selective_sync_by_namespaces?
if
current_node
.
selective_sync_by_namespaces?
...
@@ -35,7 +37,7 @@ module Geo
...
@@ -35,7 +37,7 @@ module Geo
upload_table
[
:model_type
].
eq
(
'Namespace'
).
and
(
namespace_ids_in_sql
)
upload_table
[
:model_type
].
eq
(
'Namespace'
).
and
(
namespace_ids_in_sql
)
end
end
# rubocop:
enable CodeReuse/ActiveRecord
# rubocop:enable CodeReuse/ActiveRecord
def
project_uploads
def
project_uploads
project_ids
=
current_node
.
projects
.
select
(
:id
)
project_ids
=
current_node
.
projects
.
select
(
:id
)
...
...
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