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
f7947edd
Commit
f7947edd
authored
Feb 22, 2018
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix LFS false positive spec
parent
1d280246
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
ee/app/uploaders/object_storage.rb
ee/app/uploaders/object_storage.rb
+7
-1
spec/requests/lfs_http_spec.rb
spec/requests/lfs_http_spec.rb
+1
-1
No files found.
ee/app/uploaders/object_storage.rb
View file @
f7947edd
...
...
@@ -88,7 +88,13 @@ module ObjectStorage
def
changed_mounts
self
.
class
.
uploaders
.
select
do
|
mount
,
uploader_class
|
mounted_as
=
uploader_class
.
serialization_column
(
self
.
class
,
mount
)
mount
if
send
(
:"
#{
mounted_as
}
_changed?"
)
&&
send
(
:"
#{
mounted_as
}
"
)
&
.
exists?
# rubocop:disable GitlabSecurity/PublicSend
uploader
=
send
(
:"
#{
mounted_as
}
"
)
# rubocop:disable GitlabSecurity/PublicSend
next
unless
uploader
next
unless
uploader
.
exists?
next
unless
send
(
:"
#{
mounted_as
}
_changed?"
)
# rubocop:disable GitlabSecurity/PublicSend
mount
end
.
keys
end
...
...
spec/requests/lfs_http_spec.rb
View file @
f7947edd
...
...
@@ -1025,7 +1025,7 @@ describe 'Git LFS API and storage' do
context
'and workhorse requests upload finalize for a new lfs object'
do
before
do
allow_any_instance_of
(
LfsObjectUploader
).
to
receive
(
:exists?
)
{
false
}
lfs_object
.
destroy
end
context
'with object storage disabled'
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