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

Port gitlab-ee!5532 to CE

See merge request gitlab-org/gitlab-ce!20100

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
+

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