stable

Clone or download

Read-only

Merge 'gerrit #6148' into stable/master

* commit '55c9fb2': request #9314: Non aligned behavior between UI and ssh in Git Change-Id: Ie823f4d3190658a6257368e25114c8fc30ed859f

Modified Files

Name
M plugins/git/tests/rest/GitDataBuilder.php +1 −1 Go to diff View file
M src/common/dao/UGroupDao.class.php +51 −7 Go to diff View file
M src/common/include/SiteCache.php +2 −2 Go to diff View file
M src/common/project/ProjectCreationData.class.php +15 −6 Go to diff View file
M src/common/user/User.class.php +1 −1 Go to diff View file
M src/common/xml/resources/project-definition.rnc +1 −1 Go to diff View file
M src/common/xml/resources/project/project-definition.rng +1 −1 Go to diff View file
M tests/lib/TestDataBuilder.php +52 −3 Go to diff View file
M tests/rest/ProjectTest.php +8 −0 Go to diff View file
M tests/rest/UserGroupTest.php +27 −2 Go to diff View file
M tests/rest/UsersTest.php +171 −1 Go to diff View file
M tests/rest/_fixtures/01-private-member/project.xml +9 −0 Go to diff View file
M tests/rest/_fixtures/01-private-member/user_map.csv +4 −1 Go to diff View file
M tests/rest/_fixtures/01-private-member/users.xml +25 −4 Go to diff View file
M tests/rest/_fixtures/02-private/users.xml +1 −1 Go to diff View file
M tests/rest/_fixtures/04-public-member/project.xml +9 −0 Go to diff View file
M tests/rest/_fixtures/04-public-member/users.xml +22 −1 Go to diff View file
M tests/rest/_fixtures/05-pbi/users.xml +1 −1 Go to diff View file
M tests/rest/_fixtures/06-dragndrop/users.xml +1 −1 Go to diff View file
M tests/rest/_fixtures/07-computedfield/users.xml +1 −1 Go to diff View file
A tests/rest/_fixtures/08-public-including-restricted/project.xml +23 −0 Go to diff View file
A tests/rest/_fixtures/08-public-including-restricted/user_map.csv +1 −0 Go to diff View file
A tests/rest/_fixtures/08-public-including-restricted/users.xml +31 −0 Go to diff View file
M tests/rest/bin/run.sh +1 −0 Go to diff View file
M tests/rest/bin/setup.sh +54 −0 Go to diff View file