From 264d770bf37bec2ca04e8b93a062091e1bf5d4f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mica=C3=ABl=20Bergeron?= Date: Fri, 22 Jun 2018 08:33:43 -0400 Subject: make the pseudonymizer application settings EE-CE friendly --- app/views/admin/application_settings/show.html.haml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/views/admin/application_settings/show.html.haml b/app/views/admin/application_settings/show.html.haml index 38607ffca1c..b5f93425a72 100644 --- a/app/views/admin/application_settings/show.html.haml +++ b/app/views/admin/application_settings/show.html.haml @@ -324,3 +324,5 @@ = _('Configure push mirrors.') .settings-content = render partial: 'repository_mirrors_form' + += render_if_exists 'pseudonymizer_settings' -- cgit v1.2.1 From 63d15c83a14538d3cd4e27b89d26e63ccd595431 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mica=C3=ABl=20Bergeron?= Date: Fri, 22 Jun 2018 09:32:57 -0400 Subject: port stub_object_storage changes --- spec/support/helpers/stub_object_storage.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 -- cgit v1.2.1 From 66ad2ea1c06e2994396303dd51181a83b6c66bc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mica=C3=ABl=20Bergeron?= Date: Tue, 26 Jun 2018 13:03:34 +0000 Subject: port the EE changes --- app/views/admin/application_settings/show.html.haml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/admin/application_settings/show.html.haml b/app/views/admin/application_settings/show.html.haml index b5f93425a72..bd43504dd37 100644 --- a/app/views/admin/application_settings/show.html.haml +++ b/app/views/admin/application_settings/show.html.haml @@ -325,4 +325,5 @@ .settings-content = render partial: 'repository_mirrors_form' -= render_if_exists 'pseudonymizer_settings' += render_if_exists 'admin/application_settings/pseudonymizer_settings', expanded: expanded + -- cgit v1.2.1