Commit fbcc851f authored by Stan Hu's avatar Stan Hu

Merge branch 'ce-gitlab-elt' into 'master'

Port gitlab-ee!5532 to CE

See merge request gitlab-org/gitlab-ce!20100
parents 2440b7b6 66ad2ea1
...@@ -324,3 +324,6 @@ ...@@ -324,3 +324,6 @@
= _('Configure push mirrors.') = _('Configure push mirrors.')
.settings-content .settings-content
= render partial: 'repository_mirrors_form' = render partial: 'repository_mirrors_form'
= render_if_exists 'admin/application_settings/pseudonymizer_settings', expanded: expanded
...@@ -15,9 +15,14 @@ module StubObjectStorage ...@@ -15,9 +15,14 @@ module StubObjectStorage
return unless enabled return unless enabled
stub_object_storage(connection_params: uploader.object_store_credentials,
remote_directory: remote_directory)
end
def stub_object_storage(connection_params:, remote_directory:)
Fog.mock! Fog.mock!
::Fog::Storage.new(uploader.object_store_credentials).tap do |connection| ::Fog::Storage.new(connection_params).tap do |connection|
begin begin
connection.directories.create(key: remote_directory) connection.directories.create(key: remote_directory)
rescue Excon::Error::Conflict rescue Excon::Error::Conflict
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment