Merge branch 'sh-fix-matomo-js' into 'master'

Fix CSP errors relating to matomo.js [RUN ALL RSPEC]

See merge request gitlab-org/gitlab!48611

config/initializers/1_settings.rb

@@ -785,8 +785,8 @@ Settings.forti_authenticator['port'] = 443 if Settings.forti_authenticator['port
 # Extra customization
 #
 Settings['extra'] ||= Settingslogic.new({})
-Settings.extra['matomo_site_id'] ||= Settings.extra['piwik_site_id']
-Settings.extra['matomo_url'] ||= Settings.extra['piwik_url']
+Settings.extra['matomo_site_id'] ||= Settings.extra['piwik_site_id'] if Settings.extra['piwik_site_id'].present?
+Settings.extra['matomo_url'] ||= Settings.extra['piwik_url'] if Settings.extra['piwik_url'].present?
 
 #
 # Rack::Attack settings