diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-06-26 14:39:30 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-06-26 14:39:30 +0000 |
| commit | fbcc851f5c0b76587f325806760c3a63e23daceb (patch) | |
| tree | 09cbcd0abbd13675dee8cacedc603b03920b29ce | |
| parent | 2440b7b6f150ad32a96140023755667b54490e6c (diff) | |
| parent | 66ad2ea1c06e2994396303dd51181a83b6c66bc8 (diff) | |
| download | gitlab-ce-fbcc851f5c0b76587f325806760c3a63e23daceb.tar.gz | |
Merge branch 'ce-gitlab-elt' into 'master'
Port gitlab-ee!5532 to CE
See merge request gitlab-org/gitlab-ce!20100
| -rw-r--r-- | app/views/admin/application_settings/show.html.haml | 3 | ||||
| -rw-r--r-- | spec/support/helpers/stub_object_storage.rb | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/app/views/admin/application_settings/show.html.haml b/app/views/admin/application_settings/show.html.haml index 38607ffca1c..bd43504dd37 100644 --- a/app/views/admin/application_settings/show.html.haml +++ b/app/views/admin/application_settings/show.html.haml @@ -324,3 +324,6 @@ = _('Configure push mirrors.') .settings-content = render partial: 'repository_mirrors_form' + += render_if_exists 'admin/application_settings/pseudonymizer_settings', expanded: expanded + diff --git a/spec/support/helpers/stub_object_storage.rb b/spec/support/helpers/stub_object_storage.rb index bceaf8277ee..471b0a74a19 100644 --- a/spec/support/helpers/stub_object_storage.rb +++ b/spec/support/helpers/stub_object_storage.rb @@ -15,9 +15,14 @@ module StubObjectStorage 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::Storage.new(uploader.object_store_credentials).tap do |connection| + ::Fog::Storage.new(connection_params).tap do |connection| begin connection.directories.create(key: remote_directory) rescue Excon::Error::Conflict |