stable

Clone or download

Read-only

Merge commit 'refs/changes/72/10172/1' of ssh://gerrit.tuleap.net:29418/tuleap into HEAD

* ssh://gerrit.tuleap.net:29418/tuleap: request #10931: Cannot add a site administrator to a project adminstrators users group Change-Id: Ia2315595485a677c541feb4d691dd8e989d8b02c

Modified Files

Name
M src/common/autoload.php +3 −2 Go to diff View file
M src/common/project/Admin/ProjectUGroup/DynamicUGroupMembersUpdater.php +1 −1 Go to diff View file
A src/common/project/Admin/ProjectUGroup/UserIsUGroupMemberChecker.php +83 −0 Go to diff View file
M src/common/project/REST/v1/UserGroupResource.class.php +16 −6 Go to diff View file
M src/common/project/UserPermissionsDao.php +82 −1 Go to diff View file
M src/templates/project/admin/ugroup-add-project-administrator-modal.mustache +1 −1 Go to diff View file
M src/templates/project/admin/ugroup-settings-member-list.mustache +1 −1 Go to diff View file
M src/www/scripts/project/admin/project-admin-ugroups.js +2 −2 Go to diff View file