dev

Clone or download

Read-only

Merge commit 'refs/changes/59/359/6' of ssh://gerrit.tuleap.net:29418/tuleap into tuleap-stable-master

* ssh://gerrit.tuleap.net:29418/tuleap: story #2967 - Serialize gitolite events Conflicts: plugins/git/include/Git/RemoteServer/GerritServerFactory.class.php plugins/git/include/autoload.php plugins/git/include/gitPlugin.class.php plugins/git/site-content/en_US/git.tab

Modified Files

Name
M plugins/git/db/install.sql +1 −0 Go to diff View file
A plugins/git/db/mysql/updates/2013/201304111018_add_remote_server_key.php +83 −0 Go to diff View file
M plugins/git/include/Git.class.php +23 −4 Go to diff View file
M plugins/git/include/Git/Admin.class.php +8 −8 Go to diff View file
M plugins/git/include/Git/RemoteServer/Dao.class.php +10 −9 Go to diff View file
D plugins/git/include/Git/RemoteServer/Gerrit/ReplicationSSHKeyFactory.class.php +0 −139 Go to diff View file
M plugins/git/include/Git/RemoteServer/GerritServer.class.php +4 −4 Go to diff View file
M plugins/git/include/Git/RemoteServer/GerritServerFactory.class.php +12 −19 Go to diff View file
A plugins/git/include/Git/SystemEventManager.class.php +109 −0 Go to diff View file
M plugins/git/include/GitActions.class.php +22 −44 Go to diff View file
M plugins/git/include/GitBackend.class.php +10 −13 Go to diff View file
M plugins/git/include/GitDriver.class.php +9 −0 Go to diff View file
M plugins/git/include/GitRepository.class.php +9 −1 Go to diff View file
M plugins/git/include/GitRepositoryManager.class.php +27 −14 Go to diff View file
M plugins/git/include/GitViews/ShowRepo/Content.class.php +13 −1 Go to diff View file
M plugins/git/include/Git_Backend_Gitolite.class.php +33 −36 Go to diff View file
M plugins/git/include/Git_Backend_Interface.php +10 −8 Go to diff View file
M plugins/git/include/Git_GitoliteDriver.class.php +17 −1 Go to diff View file
M plugins/git/include/Git_Gitolite_SSHKeyDumper.class.php +4 −1 Go to diff View file
M plugins/git/include/Git_Gitolite_SSHKeyMassDumper.class.php +4 −1 Go to diff View file
M plugins/git/include/autoload.php +11 −7 Go to diff View file
A plugins/git/include/events/SystemEvent_GIT_GERRIT_ADMIN_KEY_DUMP.class.php +73 −0 Go to diff View file
M plugins/git/include/events/SystemEvent_GIT_GERRIT_MIGRATION.class.php +1 −1 Go to diff View file
M plugins/git/include/events/SystemEvent_GIT_REPO_ACCESS.class.php +1 −0 Go to diff View file
D plugins/git/include/events/SystemEvent_GIT_REPO_CREATE.class.php +0 −111 Go to diff View file
M plugins/git/include/events/SystemEvent_GIT_REPO_DELETE.class.php +1 −1 Go to diff View file
A plugins/git/include/events/SystemEvent_GIT_REPO_FORK..php +78 −0 Go to diff View file
A plugins/git/include/events/SystemEvent_GIT_REPO_UPDATE.class.php +73 −0 Go to diff View file
M plugins/git/include/gitPlugin.class.php +80 −49 Go to diff View file
M plugins/git/site-content/en_US/git.tab +3 −2 Go to diff View file
M plugins/git/site-content/fr_FR/git.tab +7 −0 Go to diff View file
M plugins/git/tests/Git/AdminTest.php +15 −20 Go to diff View file
M plugins/git/tests/Git/Driver/Gerrit/ProjectCreatorTest.php +1 −2 Go to diff View file
M plugins/git/tests/Git/Driver/Gerrit/RemoteSSHCommandTest.php +1 −3 Go to diff View file
D plugins/git/tests/Git/RemoteServer/Gerrit/ReplicationSSHKeyFactoryTest.php +0 −332 Go to diff View file
M plugins/git/tests/Git/RemoteServer/GerritServerFactoryTest.php +36 −16 Go to diff View file
M plugins/git/tests/Git/RemoteServer/GerritServerTest.php +6 −6 Go to diff View file
A plugins/git/tests/Git/SystemEventManagerTest.php +154 −0 Go to diff View file
M plugins/git/tests/GitActionsTest.php +85 −88 Go to diff View file
M plugins/git/tests/GitRepositoryManagerTest.php +128 −25 Go to diff View file
M plugins/git/tests/Git_Backend_GitoliteTest.php +32 −20 Go to diff View file
M plugins/git/tests/Git_Gitolite_SSHKeyDumperTest.php +4 −0 Go to diff View file
M plugins/git/tests/Git_Gitolite_SSHKeyMassDumperTest.php +3 −0 Go to diff View file
A plugins/git/tests/events/SystemEvent_GIT_GERRIT_ADMIN_KEY_DUMPTest.php +113 −0 Go to diff View file
A plugins/git/tests/events/SystemEvent_GIT_REPO_FORKTest.php +69 −0 Go to diff View file
A plugins/git/tests/events/SystemEvent_GIT_REPO_UPDATETest.php +61 −0 Go to diff View file
M plugins/git/www/themes/default/css/style.css +6 −0 Go to diff View file