Commit 6d644878 authored by Thomas Löffler's avatar Thomas Löffler

Merge branch 'develop' into 'master'

Release 19-05-20

See merge request !196
parents 89fd74a7 ccb63d8a
Pipeline #8938 passed with stages
in 5 minutes and 25 seconds
/vendor/
/var/
/public/
!/public/.well-known/security.txt
!/public/humans.txt
/private/
!/private/typo3conf/LocalConfiguration.php
......
include:
- project: 't3o/t3olayout'
ref: master
ref: 4.1.5
file: '/Configuration/GitLab/t3o-builds.yml'
variables:
......
......@@ -49,7 +49,6 @@ set('rsync', [
'timeout' => 300
]);
set('rsync_src', './');
set('keep_releases', 10);
inventory('./.gitlab-ci/deployer/servers.yml');
set('php', '/opt/php/php72/bin/php');
set('bin_folder', 'vendor/bin/');
......
......@@ -15,4 +15,4 @@ develop:
writable_mode: chmod
forward_agent: true
deploy_path: ~/ci/
keep_releases: 5
keep_releases: 2
This diff is collapsed.
......@@ -229,7 +229,7 @@ Your TYPO3 website administration team';
throw $e;
}
return $ldap->deleteUser($data['userName']);
return $ldap->deleteUser($data['username']);
}
protected function deleteLocalUser(array $data): void
......
......@@ -149,7 +149,7 @@ return [
],
'devIPmask' => '*',
'displayErrors' => 1,
'encryptionKey' => 'db379ac7cd9a141040b6b9eca3fd574c0513c1200bdf1af600794d434a682b7ff170107496d1f0445d432d0e7d2a74f5',
'encryptionKey' => 'this.key.is.changed.on.remote.servers',
'exceptionalErrors' => 12290,
'sitename' => 'my.typo3.org',
'systemLogLevel' => 0,
......
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
# Please report vulnerabilities using the TYPO3 security team address
Contact: mailto:security@typo3.org
# OpenPGP key
Encryption: https://typo3.org/fileadmin/t3o_common_storage/keys/B41CC3EF373E0F5C70187FE93BEFBD27C05FBE60.asc
Encryption: https://keys.openpgp.org/vks/v1/by-fingerprint/B41CC3EF373E0F5C70187FE93BEFBD27C05FBE60
Encryption: openpgp4fpr:B41CC3EF373E0F5C70187FE93BEFBD27C05FBE60
# Preferred language when contacting us
Preferred-Languages: en
# Canonical URL
Canonical: https://typo3.org/.well-known/security.txt
# Security and incident handling policy
Policy: https://typo3.org/community/teams/security/incident-handling
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCAAdFiEEYt7scsok31lZaNU265PT69q8o48FAl5BXU4ACgkQ65PT69q8
o4+fbQ/9E44PwUCycxzWH1yOFn56pxrCmfKdqPOdCugZSVPFxZq0RQtDRGYLJbnX
G39D8//E9jMJ9NEHjrXka+caRjmf7QPv/L9Sw4b+9vk1ldiokW4vT7oFMFeEv8ei
stgE9uQhv+YC3+orekO1eYAG3F1DGZ6K8/Eee/upktI5pOEi0RhTNFQtRS+4tjcd
kaeNG5wl3nhuakGUzf9Dlv9WDneE9CjpiUryRUpcj8fYXEkcxKN3k7B2oRuBEA53
vunMzegWIeRBQfxXzmNgeibChy2Sdz90vwwzXNMUcOW4VWFzNHW/SIpDgIMbEC8E
aMm3IMlGmFYLLZGoXz8KL0E8WpibHOypQB/xUvRkMveJ4heta4nL6P0TQS+mXoQW
moiaqcNdHkzLUYa3n2lyxQgFhWWNPiLG/K4remWmru24hsIPFDzMxrkehDYmJ9Vz
0HkzG8Gv6i6b5bqbbnjhS4hlw+fBdM49fjDsB0AcleXUr58FMI6Ll4liJacHKkLa
JfYF3PHrRo/5uqDQ91I/y1Tt5hoBbDAHLk+6UOzHpzSsqYzyE+dKV5F/cutF5DPm
URECYKT7ipjecjEf8sK3Ey7a1jcZgXqH4OTE/NLWoGPyipupJl4IsMQ+p8LCsgBm
jrj/oz9wlbC4V0F9zKICWfUOz2RWxi9B3bXwTpWRndAX+2pk7Bk=
=ACTV
-----END PGP SIGNATURE-----
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