stable

Clone or download

Read-only

Merge branch 'stable' into HEAD

* stable: This is Tuleap 9.0.99.28 Fix issues with the CI concerning database access This is Tuleap 9.0.99.27 This is Tuleap 9.0.99.26 Activating and add regexp in same time should be allowed This is Tuleap 9.0.99.25 Uncheck regexp in admin view request #9600 Archive deleted items must deal with duplicate content This is Tuleap 9.0.99.24 This is Tuleap 9.0.99.23 Pattern must end with $ This is Tuleap 9.0.99.22 Log in project history regexp activation at repository level request #9599: Misleading warning message when using IE11 with compatibility Conflicts: plugins/git/include/Git/AdminRouter.class.php plugins/git/include/Git/GeneralSettingsController.php plugins/git/include/gitPlugin.class.php plugins/git/site-content/fr_FR/git.tab plugins/git/templates/admin-plugin-general.mustache Change-Id: I241f8b5045587bd5857bc5858582e7e8ecc9d578

Modified Files

Name
M ChangeLog +9 −4 Go to diff View file
M VERSION +1 −1 Go to diff View file
M plugins/archivedeleteditems/ChangeLog +3 −0 Go to diff View file
M plugins/archivedeleteditems/VERSION +1 −1 Go to diff View file
M plugins/archivedeleteditems/include/FileCopier.php +8 −3 Go to diff View file
M plugins/archivedeleteditems/include/archivedeleteditemsPlugin.class.php +12 −9 Go to diff View file
M plugins/archivedeleteditems/tests/FileCopierTest.php +10 −3 Go to diff View file
M plugins/docman/ChangeLog +3 −0 Go to diff View file
M plugins/docman/VERSION +1 −1 Go to diff View file
M plugins/docman/include/Docman_VersionFactory.class.php +9 −6 Go to diff View file
M plugins/git/ChangeLog +15 −0 Go to diff View file
M plugins/git/VERSION +1 −1 Go to diff View file
M plugins/git/include/Git/AdminRouter.class.php +10 −2 Go to diff View file
M plugins/git/include/Git/GeneralSettingsController.php +23 −3 Go to diff View file
M plugins/git/include/Git/GeneralSettingsPresenter.php +0 −4 Go to diff View file
M plugins/git/include/Git/Gitolite/ConfigPermissionsSerializer.class.php +22 −5 Go to diff View file
M plugins/git/include/Git/Permissions/FineGrainedPermissionFactory.php +4 −3 Go to diff View file
M plugins/git/include/Git/Permissions/PatternValidator.php +2 −2 Go to diff View file
M plugins/git/include/Git/Permissions/RegexpFineGrainedDao.php +7 −0 Go to diff View file
M plugins/git/include/Git/Permissions/RegexpFineGrainedDisabler.php +12 −1 Go to diff View file
M plugins/git/include/Git/Permissions/RegexpFineGrainedRetriever.php +5 −0 Go to diff View file
M plugins/git/include/Git/Permissions/RegexpPermissionFilter.php +8 −3 Go to diff View file
M plugins/git/include/GitActions.class.php +19 −1 Go to diff View file
M plugins/git/include/GitForkPermissionsManager.class.php +30 −2 Go to diff View file
M plugins/git/include/GitPresenters/AccessControlPresenter.class.php +4 −5 Go to diff View file
M plugins/git/include/GitPresenters/AdminDefaultSettingsPresenter.php +2 −4 Go to diff View file
M plugins/git/include/GitViews/RepoManagement/Pane/AccessControl.class.php +8 −2 Go to diff View file
M plugins/git/include/Git_Backend_Gitolite.class.php +10 −7 Go to diff View file
M plugins/git/include/Git_GitoliteDriver.class.php +2 −1 Go to diff View file
M plugins/git/include/gitPlugin.class.php +4 −3 Go to diff View file
M plugins/git/site-content/en_US/git.tab +8 −3 Go to diff View file
M plugins/git/site-content/fr_FR/git.tab +7 −2 Go to diff View file
M plugins/git/templates/admin-plugin-general.mustache +3 −10 Go to diff View file
M plugins/git/templates/settings/popover-remove-non-valid-regexp-permission.mustache +3 −1 Go to diff View file
M plugins/git/tests/Git/Gitolite/ConfigPermissionsSerializerTest.php +186 −36 Go to diff View file
M plugins/git/tests/Git/Gitolite/ProjectSerializerTest.php +2 −1 Go to diff View file
M plugins/git/tests/Git/Permissions/PatternValidatorTest.php +11 −2 Go to diff View file
M plugins/git/tests/Git_GitoliteDriverTest.php +2 −1 Go to diff View file
M plugins/git/tests/Git_GitoliteTestCase.class.php +3 −1 Go to diff View file
M plugins/git/www/scripts/permissions.js +5 −0 Go to diff View file
M plugins/svn/ChangeLog +6 −0 Go to diff View file
M plugins/svn/VERSION +1 −1 Go to diff View file
M plugins/svn/include/Svn/Repository/RepositoryManager.class.php +5 −4 Go to diff View file
M plugins/svn/tests/Svn/XMLImporterTest.php +11 −12 Go to diff View file
M plugins/tracker/ChangeLog +3 −0 Go to diff View file
M plugins/tracker/VERSION +1 −1 Go to diff View file
M plugins/tracker/tests/Tracker_Artifact_ProcessAssociateArtifact_Test.php +5 −9 Go to diff View file
M site-content/en_US/include/include.tab +1 −1 Go to diff View file
M site-content/fr_FR/include/include.tab +1 −1 Go to diff View file
M src/common/frs/FRSFileFactory.class.php +8 −5 Go to diff View file