stable

Clone or download

Read-only

Merge branch 'stable' into HEAD

* stable: (46 commits) This is Tuleap 8.16.99.3 request #9287 A pattern must be in read only if no writers and rewinders This is Tuleap 8.16.99.2 Check if we can build packages for a specific OS version before building them This is Tuleap 8.16.99.1 request #9278: Remove CentOS 5 packages This is Tuleap 8.16 Update SOAP version This is Tuleap 8.15.99.118 Take into account permission order This is Tuleap 8.15.99.117 request #9275 Fatal error on project creation with fine grain perms in template This is Tuleap 8.15.99.116 This is Tuleap 8.15.99.115 Sort fine-grained permissions Restrict pattern definition This is Tuleap 8.15.99.114 This is Tuleap 8.15.99.113 request #9271 gitolite rule error when "Nobody" or nothing is selected request #9269: Fix the creation of new mailing list ... Conflicts: plugins/tracker/templates/siteadmin-config/emailgateway.mustache plugins/tracker/templates/siteadmin-config/natures.mustache tools/rpm/tuleap.spec Change-Id: I6d214ae1a7a29d47359ea4dd066527e1e105edfa

Modified Files

Name
M ChangeLog +13 −4 Go to diff View file
M VERSION +1 −1 Go to diff View file
M plugins/agiledashboard/ChangeLog +3 −0 Go to diff View file
M plugins/agiledashboard/VERSION +1 −1 Go to diff View file
M plugins/agiledashboard/www/js/kanban/Gruntfile.js +6 −4 Go to diff View file
M plugins/agiledashboard/www/js/planning-v2/Gruntfile.js +6 −4 Go to diff View file
M plugins/git/ChangeLog +30 −0 Go to diff View file
M plugins/git/VERSION +1 −1 Go to diff View file
M plugins/git/include/Git.class.php +1 −1 Go to diff View file
M plugins/git/include/Git/Gitolite/ConfigPermissionsSerializer.class.php +122 −7 Go to diff View file
M plugins/git/include/Git/Permissions/DefaultFineGrainedPermissionFactory.php +80 −9 Go to diff View file
A plugins/git/include/Git/Permissions/FineGrainedPatternValidator.php +33 −0 Go to diff View file
M plugins/git/include/Git/Permissions/FineGrainedPermissionFactory.php +28 −4 Go to diff View file
A plugins/git/include/Git/Permissions/FineGrainedPermissionSorter.php +37 −0 Go to diff View file
M plugins/git/include/Git/SystemEventManager.class.php +10 −1 Go to diff View file
M plugins/git/include/GitPermissionsManager.class.php +33 −18 Go to diff View file
M plugins/git/include/GitPresenters/AccessControlPresenter.class.php +2 −9 Go to diff View file
M plugins/git/include/GitPresenters/AdminDefaultSettingsPresenter.php +0 −8 Go to diff View file
M plugins/git/include/Git_GitoliteDriver.class.php +3 −1 Go to diff View file
M plugins/git/include/REST/v1/RepositoryResource.class.php +8 −4 Go to diff View file
M plugins/git/include/autoload.php +4 −2 Go to diff View file
M plugins/git/include/gitPlugin.class.php +25 −4 Go to diff View file
M plugins/git/site-content/en_US/git.tab +1 −1 Go to diff View file
M plugins/git/site-content/fr_FR/git.tab +1 −1 Go to diff View file
M plugins/git/templates/fine_grained.mustache +3 −1 Go to diff View file
M plugins/git/tests/Git/Gitolite/ConfigPermissionsSerializerTest.php +289 −13 Go to diff View file
M plugins/git/tests/Git/Gitolite/ProjectSerializerTest.php +4 −2 Go to diff View file
M plugins/git/tests/Git/Permissions/DefaultFineGrainedPermissionFactoryTest.php +8 −1 Go to diff View file
A plugins/git/tests/Git/Permissions/FineGrainedPatternValidatorTest.php +61 −0 Go to diff View file
M plugins/git/tests/Git/Permissions/FineGrainedPermissionFactoryTest.php +3 −1 Go to diff View file
A plugins/git/tests/Git/Permissions/FineGrainedPermissionSorterTest.php +91 −0 Go to diff View file
M plugins/git/tests/Git_GitoliteDriverTest.php +4 −2 Go to diff View file
M plugins/git/tests/Git_GitoliteTestCase.class.php +3 −1 Go to diff View file
M plugins/git/tests/rest/GitDataBuilder.php +16 −2 Go to diff View file
M plugins/tracker/ChangeLog +21 −0 Go to diff View file
M plugins/tracker/VERSION +1 −1 Go to diff View file
M plugins/tracker/include/Tracker/Config/SectionsPresenter.php +0 −4 Go to diff View file
M plugins/tracker/include/Tracker/FormElement/Tracker_FormElement_Field_Computed.class.php +65 −30 Go to diff View file
M plugins/tracker/include/Tracker/FormElement/View/Admin/Field/Computed.class.php +0 −38 Go to diff View file
M plugins/tracker/include/Tracker/FormElement/dao/Tracker_FormElement_Field_ComputedDao.class.php +42 −14 Go to diff View file
M plugins/tracker/include/Tracker/Tracker.class.php +0 −13 Go to diff View file
M plugins/tracker/include/Tracker/TrackerManager.class.php +0 −13 Go to diff View file
M plugins/tracker/site-content/en_US/tracker.tab +0 −6 Go to diff View file
M plugins/tracker/site-content/fr_FR/tracker.tab +0 −5 Go to diff View file
M plugins/tracker/templates/siteadmin-config/emailgateway.mustache +0 −1 Go to diff View file
M plugins/tracker/templates/siteadmin-config/natures.mustache +0 −1 Go to diff View file
M plugins/tracker/tests/Tracker_FormElement_Field_ComputedTest.php +65 −20 Go to diff View file
M plugins/tracker/www/scripts/TrackerArtifactEditionSwitcher.js +81 −16 Go to diff View file
M plugins/tracker/www/themes/default/css/style.scss +8 −0 Go to diff View file
M src/common/project/ProjectXMLImporter.class.php +1 −1 Go to diff View file
D src/etc/my.cnf.rhel5.dist +0 −33 Go to diff View file
M src/www/mail/admin/index.php +1 −1 Go to diff View file
M src/www/soap/ChangeLog +11 −8 Go to diff View file
M src/www/soap/VERSION +1 −1 Go to diff View file
M tools/rpm/Makefile +1 −2 Go to diff View file
M tools/rpm/README +0 −1 Go to diff View file
M tools/rpm/docker_generate_packages.sh +0 −8 Go to diff View file
M tools/setup.sh +0 −4 Go to diff View file