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
17e7f5ba
Commit
17e7f5ba
authored
Dec 04, 2017
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make Rubocop happy
parent
7b921683
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
app/models/geo_node.rb
app/models/geo_node.rb
+2
-2
spec/models/geo_node_status_spec.rb
spec/models/geo_node_status_spec.rb
+0
-1
No files found.
app/models/geo_node.rb
View file @
17e7f5ba
...
...
@@ -135,8 +135,8 @@ class GeoNode < ActiveRecord::Base
if
selective_sync?
relations
=
namespaces
.
map
{
|
namespace
|
namespace
.
all_projects
.
select
(
:id
)
}
Project
.
unscoped
.
from
(
"(
#{
Gitlab
::
SQL
::
Union
.
new
(
relations
).
to_sql
}
)
#{
Project
.
table_name
}
"
)
Project
.
unscoped
.
from
(
"(
#{
Gitlab
::
SQL
::
Union
.
new
(
relations
).
to_sql
}
)
#{
Project
.
table_name
}
"
)
else
Project
.
all
end
...
...
spec/models/geo_node_status_spec.rb
View file @
17e7f5ba
...
...
@@ -62,7 +62,6 @@ describe GeoNodeStatus, :geo, :truncate do
create
(
:geo_file_registry
,
:avatar
,
file_id:
uploads
[
2
],
success:
false
)
expect
(
subject
.
attachments_synced_count
).
to
eq
(
2
)
end
it
'does not count synced files that were replaced'
do
...
...
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