stable

Clone or download

Read-only

Merge 'gerrit #16733' into stable/master

* commit 'aa21ca3484': request #16149: Use user's initials as default avatar Change-Id: Ifc2e446d6dc9c1f195aba13d41fdf96a8f7dd9e0

Modified Files

Name
M plugins/git/tests/rest/Git/RepositoryTest.php +6 −6 Go to diff View file
M plugins/oauth2_server/tests/unit/User/UserInfoControllerTest.php +3 −2 Go to diff View file
M plugins/oauth2_server/tests/unit/User/UserInfoResponseRepresentationTest.php +3 −2 Go to diff View file
M plugins/svn/tests/rest/TestBase.php +2 −2 Go to diff View file
M src/common/Color/AllowedColorsCollection.php +31 −28 Go to diff View file
M src/common/Color/ColorPresenterFactory.php +1 −1 Go to diff View file
M src/common/Request/RouteCollector.php +6 −4 Go to diff View file
M src/common/User/Account/AccountInformationCollectionPresenter.php +13 −2 Go to diff View file
M src/common/User/Account/ChangeAvatarController.php +13 −12 Go to diff View file
M src/common/User/Account/DisplayAccountInformationController.php +2 −0 Go to diff View file
M src/common/User/Account/UpdateAccountInformationController.php +18 −3 Go to diff View file
M src/common/User/Account/UserAvatarSaver.php +1 −1 Go to diff View file
M src/common/User/Account/templates/account-information.mustache +1 −0 Go to diff View file
M src/common/User/Admin/UserListResultsPresenter.php +1 −1 Go to diff View file
M src/common/User/Profile/AvatarController.php +14 −2 Go to diff View file
A src/common/User/Profile/AvatarGenerator.php +61 −0 Go to diff View file
M src/common/User/User.class.php +97 −66 Go to diff View file
M src/composer.json +1 −0 Go to diff View file
M src/composer.lock +825 −750 Go to diff View file
M src/db/mysql/database_structure.sql +1 −1 Go to diff View file
A src/db/mysql/updates/2020/202007211933_add_has_custom_avatar_column.php +58 −0 Go to diff View file
M src/scripts/account/avatar/reset.ts +6 −1 Go to diff View file
M tests/lib/Builders/UserTestBuilder.php +13 −0 Go to diff View file
M tests/rest/tests/UserGroupTest.php +7 −7 Go to diff View file
M tests/rest/tests/UsersTest.php +2 −2 Go to diff View file
M tests/unit/common/User/Account/DisplayAccountInformationControllerTest.php +1 −0 Go to diff View file
M tests/unit/common/User/Account/UpdateAccountInformationControllerTest.php +35 −1 Go to diff View file
M tests/unit/common/User/Account/UpdateNotificationsControllerTest.php +151 −25 Go to diff View file
M tests/unit/common/User/Account/UserAvatarSaverTest.php +1 −1 Go to diff View file