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
57b90490
Commit
57b90490
authored
Jun 07, 2017
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix test failures
parent
49070883
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
4 deletions
+2
-4
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+1
-3
spec/uploaders/object_store_uploader_spec.rb
spec/uploaders/object_store_uploader_spec.rb
+1
-1
No files found.
config/initializers/1_settings.rb
View file @
57b90490
...
...
@@ -315,9 +315,7 @@ Settings.artifacts['object_store'] ||= Settingslogic.new({})
Settings
.
artifacts
[
'object_store'
][
'enabled'
]
=
false
if
Settings
.
artifacts
[
'object_store'
][
'enabled'
].
nil?
Settings
.
artifacts
[
'object_store'
][
'remote_directory'
]
||=
nil
# Convert upload connection settings to use symbol keys, to make Fog happy
if
Settings
.
artifacts
[
'object_store'
][
'connection'
]
Settings
.
artifacts
[
'object_store'
][
'connection'
].
deep_symbolize_keys!
end
Settings
.
artifacts
[
'object_store'
][
'connection'
]
&
.
deep_symbolize_keys!
#
# Registry
...
...
spec/uploaders/object_store_uploader_spec.rb
View file @
57b90490
...
...
@@ -95,7 +95,7 @@ describe ObjectStoreUploader do
context
'when migrating to remote storage'
do
let
(
:new_store
)
{
described_class
::
REMOTE_STORE
}
let!
(
current_path
)
{
uploader
.
path
}
let!
(
:
current_path
)
{
uploader
.
path
}
it
"file does exist"
do
expect
(
File
.
exist?
(
current_path
)).
to
eq
(
true
)
...
...
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