Merge branch 'master' of github.com:facebook/phabricator
Audited00d9aae894fb
Actions

Description

Merge branch 'master' of github.com:facebook/phabricator

Details

Group Auditors

Provenance

chad	Authored on Oct 29 2013, 11:13 PM

Parents

rPf82cb0e0635a: Clean up Phriction History View
rPc749fcc192f1: Reject SCP-style URIs with explicit protocols in Diffusion

Branches

Unknown

Tags

Unknown

Event Timeline

btrahan accepted this commit.Nov 7 2013, 12:59 AM

Merged Changes

c749fcc192f1 Reject SCP-style URIs with explicit protocols in Diffusion
Author
epriestley
Revisions
D7431: Reject SCP-style URIs with explicit protocols in Diffusion
Browse Repository
No Builds
No Audits
59922b78b9bc Make Phabricator clone bare git repositories
Author
epriestley
Revisions
D7430: Make Phabricator clone bare git repositories
Browse Repository
No Builds
No Audits
d8bda7c66e0a Add an "importing" state to repositories and clean up the UI
Author
epriestley
Revisions
D7429: Add an "importing" state to repositories and clean up the UI
Browse Repository
No Builds
No Audits
912509558723 Distinguish between empty and unparsed commits in Diffusion
Author
epriestley
Revisions
D7428: Distinguish between empty and unparsed commits in Diffusion
Browse Repository
No Builds
No Audits
0965f0041a5c Don't pull updates for repositories marked as hosted
Author
epriestley
Revisions
D7427: Don't pull updates for repositories marked as hosted
Browse Repository
No Builds
No Audits
d02202cde226 Enable "SSH Keys" auth panel unconditionally
Author
epriestley
Revisions
D7426: Enable "SSH Keys" auth panel unconditionally
Browse Repository
No Builds
No Audits
c6665b190731 Serve git writes over SSH
Author
epriestley
Revisions
D7425: Serve git writes over SSH
Browse Repository
No Builds
No Audits
9a2e45ef12ea Serve Git reads over SSH
Author
epriestley
Revisions
D7424: Serve Git reads over SSH
Browse Repository
No Builds
No Audits
7d9dfb561dd5 Serve Git reads over HTTP
Author
epriestley
Revisions
D7423: Serve Git reads over HTTP
Browse Repository
No Builds
No Audits
bb4904553f2c Route some VCS connections over SSH
Author
epriestley
Revisions
D7421: Route some VCS connections over SSH
Browse Repository
No Builds
No Audits
888b3839e7e8 Prepare to route VCS connections through SSH
Author
epriestley
Revisions
D7419: Prepare to route VCS connections through SSH
Browse Repository
No Builds
No Audits
c7f23f522a79 Accept and route VCS HTTP requests
Author
epriestley
Revisions
D7417: Accept and route VCS HTTP requests
Browse Repository
No Builds
No Audits
bb35f8ec9fe9 Add hosting, serving, and push policy options to repository edit
Author
epriestley
Revisions
D7416: Add hosting, serving, and push policy options to repository edit
Browse Repository
No Builds
No Audits
86fe020a97b8 Add global "push" policy to Repositories
Author
epriestley
Revisions
D7415: Add global "push" policy to Repositories
Browse Repository
No Builds
No Audits
ba63c5e42619 Ship "Repositories" create button to new Diffusion workflow
Author
epriestley
Revisions
D7414: Ship "Repositories" create button to new Diffusion workflow
Browse Repository
No Builds
No Audits
5f6ea9f662aa Activate the new Repository creation workflow
Author
epriestley
Revisions
D7413: Activate the new Repository creation workflow
Browse Repository
No Builds
No Audits
c585f97e90d2 Remove horrible old repository edit controller
Author
epriestley
Revisions
D7410: Remove horrible old repository edit controller
Browse Repository
No Builds
No Audits

Changes (71)

Path

Size

bin/

ssh-auth-key

conf/

default.conf.php

resources/

sql/

patches/

20131025.repopush.sql

20131026.commitstatus.sql

sshd

phabricator-ssh-hook.sh

sshd_config.example

scripts/

ssh/

	ssh-auth-key.php
	ssh-auth.php

ssh-auth.php

ssh-exec.php

src/

__phutil_library_map__.php

aphront/

response/

AphrontResponse.php

sink/

AphrontHTTPSink.php

AphrontIsolatedHTTPSink.php

AphrontPHPHTTPSink.php

applications/

base/

controller/

PhabricatorController.php

conduit/

ssh/

ConduitSSHWorkflow.php

config/

check/

PhabricatorSetupCheckExtraConfig.php

option/

PhabricatorAuthenticationConfigOptions.php

diffusion/

application/

PhabricatorApplicationDiffusion.php

capability

DiffusionCapabilityCreateRepositories.php

DiffusionCapabilityDefaultEdit.php

DiffusionCapabilityDefaultPush.php

DiffusionCapabilityDefaultView.php

DiffusionCapabilityPush.php

controller/

DiffusionCommitController.php

DiffusionController.php

DiffusionRepositoryController.php

DiffusionRepositoryCreateController.php

DiffusionRepositoryDefaultController.php

DiffusionRepositoryEditBranchesController.php

DiffusionRepositoryEditHostingController.php

DiffusionRepositoryEditMainController.php

DiffusionRepositoryEditPolicyController.php

DiffusionRepositoryListController.php

query/

stablecommitname/

DiffusionGitStableCommitNameQuery.php

request/

DiffusionGitRequest.php

response

DiffusionGitResponse.php

ssh

DiffusionSSHGitReceivePackWorkflow.php

DiffusionSSHGitUploadPackWorkflow.php

DiffusionSSHGitWorkflow.php

DiffusionSSHWorkflow.php

view/

DiffusionHistoryTableView.php

repository/

PhabricatorRepositoryConfigOptions.php

application/

PhabricatorApplicationRepositories.php

conduit/

ConduitAPI_repository_create_Method.php

controller/

PhabricatorRepositoryCreateController.php

PhabricatorRepositoryEditController.php

PhabricatorRepositoryListController.php

daemon/

PhabricatorRepositoryPullLocalDaemon.php

editor/

PhabricatorRepositoryEditor.php

engine/

PhabricatorRepositoryEngine.php

PhabricatorRepositoryPullEngine.php

__tests__/

PhabricatorWorkingCopyPullTestCase.php

PhabricatorWorkingCopyTestCase.php

response

PhabricatorVCSResponse.php

storage/

PhabricatorRepository.php

PhabricatorRepositoryCommit.php

PhabricatorRepositoryTransaction.php

worker/

PhabricatorRepositoryCommitHeraldWorker.php

PhabricatorRepositoryCommitOwnersWorker.php

commitchangeparser/

PhabricatorRepositoryCommitChangeParserWorker.php

commitmessageparser/

PhabricatorRepositoryCommitMessageParserWorker.php

settings/

panel/

PhabricatorSettingsPanelSSHKeys.php

infrastructure/

ssh/

PhabricatorSSHWorkflow.php

storage/

patch/

PhabricatorBuiltinPatchList.php

view/

form/

control/

AphrontFormPolicyControl.php

rP00d9aae894fb

View Options

bin/ssh-auth-key

View Options

conf/default.conf.php

View Options

resources/sql/patches/20131025.repopush.sql

View Options

resources/sql/patches/20131026.commitstatus.sql

View Options

resources/sshd/phabricator-ssh-hook.sh

View Options

resources/sshd/sshd_config.example

View Options

scripts/ssh/ssh-auth-key.php

View Options

scripts/ssh/ssh-auth.php

View Options

scripts/ssh/ssh-exec.php

View Options

src/__phutil_library_map__.php

View Options

src/aphront/response/AphrontResponse.php

View Options

src/aphront/sink/AphrontHTTPSink.php

View Options

src/aphront/sink/AphrontIsolatedHTTPSink.php

View Options

src/aphront/sink/AphrontPHPHTTPSink.php

View Options

src/applications/base/controller/PhabricatorController.php

View Options

src/applications/conduit/ssh/ConduitSSHWorkflow.php

View Options

src/applications/config/check/PhabricatorSetupCheckExtraConfig.php

View Options

src/applications/config/option/PhabricatorAuthenticationConfigOptions.php

View Options

src/applications/diffusion/application/PhabricatorApplicationDiffusion.php

View Options

src/applications/diffusion/capability/DiffusionCapabilityCreateRepositories.php

View Options

src/applications/diffusion/capability/DiffusionCapabilityDefaultEdit.php

View Options

src/applications/diffusion/capability/DiffusionCapabilityDefaultPush.php

View Options

src/applications/diffusion/capability/DiffusionCapabilityDefaultView.php

View Options

src/applications/diffusion/capability/DiffusionCapabilityPush.php

View Options

src/applications/diffusion/controller/DiffusionCommitController.php

View Options

src/applications/diffusion/controller/DiffusionController.php

View Options

src/applications/diffusion/controller/DiffusionRepositoryController.php

View Options

src/applications/diffusion/controller/DiffusionRepositoryCreateController.php

View Options

src/applications/diffusion/controller/DiffusionRepositoryDefaultController.php

View Options

src/applications/diffusion/controller/DiffusionRepositoryEditBranchesController.php

View Options

src/applications/diffusion/controller/DiffusionRepositoryEditHostingController.php

View Options

src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php

View Options

src/applications/diffusion/controller/DiffusionRepositoryEditPolicyController.php

View Options

src/applications/diffusion/controller/DiffusionRepositoryListController.php

View Options

src/applications/diffusion/query/stablecommitname/DiffusionGitStableCommitNameQuery.php

View Options

src/applications/diffusion/request/DiffusionGitRequest.php

View Options

src/applications/diffusion/response/DiffusionGitResponse.php

View Options

src/applications/diffusion/ssh/DiffusionSSHGitReceivePackWorkflow.php

View Options

src/applications/diffusion/ssh/DiffusionSSHGitUploadPackWorkflow.php

View Options

src/applications/diffusion/ssh/DiffusionSSHGitWorkflow.php

View Options

src/applications/diffusion/ssh/DiffusionSSHWorkflow.php

View Options

src/applications/diffusion/view/DiffusionHistoryTableView.php

View Options

src/applications/repository/PhabricatorRepositoryConfigOptions.php

View Options

src/applications/repository/application/PhabricatorApplicationRepositories.php

View Options

src/applications/repository/conduit/ConduitAPI_repository_create_Method.php

View Options

src/applications/repository/controller/PhabricatorRepositoryCreateController.php

View Options

src/applications/repository/controller/PhabricatorRepositoryEditController.php

View Options

src/applications/repository/controller/PhabricatorRepositoryListController.php

View Options

src/applications/repository/daemon/PhabricatorRepositoryPullLocalDaemon.php

View Options

src/applications/repository/editor/PhabricatorRepositoryEditor.php

View Options

src/applications/repository/engine/PhabricatorRepositoryEngine.php

View Options

src/applications/repository/engine/PhabricatorRepositoryPullEngine.php

View Options

src/applications/repository/engine/tests/PhabricatorWorkingCopyPullTestCase.php

View Options

src/applications/repository/engine/tests/PhabricatorWorkingCopyTestCase.php

View Options

src/applications/repository/response/PhabricatorVCSResponse.php

View Options

src/applications/repository/storage/PhabricatorRepository.php

View Options

src/applications/repository/storage/PhabricatorRepositoryCommit.php

View Options

src/applications/repository/storage/PhabricatorRepositoryTransaction.php

View Options

src/applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php

View Options

src/applications/repository/worker/PhabricatorRepositoryCommitOwnersWorker.php

View Options

src/applications/repository/worker/commitchangeparser/PhabricatorRepositoryCommitChangeParserWorker.php

View Options

src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php

View Options

src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php

View Options

src/infrastructure/ssh/PhabricatorSSHWorkflow.php

View Options

src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php

View Options

src/view/form/control/AphrontFormPolicyControl.php

Merge branch 'master' of github.com:facebook/phabricatorAudited00d9aae894fbActions

Description

Details

Event Timeline

Merged Changes

Changes (71)

rP00d9aae894fb

bin/ssh-auth-key

conf/default.conf.php

resources/sql/patches/20131025.repopush.sql

resources/sql/patches/20131026.commitstatus.sql

resources/sshd/phabricator-ssh-hook.sh

resources/sshd/sshd_config.example

scripts/ssh/ssh-auth-key.php

scripts/ssh/ssh-auth.php

scripts/ssh/ssh-exec.php

src/__phutil_library_map__.php

src/aphront/response/AphrontResponse.php

src/aphront/sink/AphrontHTTPSink.php

src/aphront/sink/AphrontIsolatedHTTPSink.php

src/aphront/sink/AphrontPHPHTTPSink.php

src/applications/base/controller/PhabricatorController.php

src/applications/conduit/ssh/ConduitSSHWorkflow.php

src/applications/config/check/PhabricatorSetupCheckExtraConfig.php

src/applications/config/option/PhabricatorAuthenticationConfigOptions.php

src/applications/diffusion/application/PhabricatorApplicationDiffusion.php

src/applications/diffusion/capability/DiffusionCapabilityCreateRepositories.php

src/applications/diffusion/capability/DiffusionCapabilityDefaultEdit.php

src/applications/diffusion/capability/DiffusionCapabilityDefaultPush.php

src/applications/diffusion/capability/DiffusionCapabilityDefaultView.php

src/applications/diffusion/capability/DiffusionCapabilityPush.php

src/applications/diffusion/controller/DiffusionCommitController.php

src/applications/diffusion/controller/DiffusionController.php

src/applications/diffusion/controller/DiffusionRepositoryController.php

src/applications/diffusion/controller/DiffusionRepositoryCreateController.php

src/applications/diffusion/controller/DiffusionRepositoryDefaultController.php

src/applications/diffusion/controller/DiffusionRepositoryEditBranchesController.php

src/applications/diffusion/controller/DiffusionRepositoryEditHostingController.php

src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php

src/applications/diffusion/controller/DiffusionRepositoryEditPolicyController.php

src/applications/diffusion/controller/DiffusionRepositoryListController.php

src/applications/diffusion/query/stablecommitname/DiffusionGitStableCommitNameQuery.php

src/applications/diffusion/request/DiffusionGitRequest.php

src/applications/diffusion/response/DiffusionGitResponse.php

src/applications/diffusion/ssh/DiffusionSSHGitReceivePackWorkflow.php

src/applications/diffusion/ssh/DiffusionSSHGitUploadPackWorkflow.php

src/applications/diffusion/ssh/DiffusionSSHGitWorkflow.php

src/applications/diffusion/ssh/DiffusionSSHWorkflow.php

src/applications/diffusion/view/DiffusionHistoryTableView.php

src/applications/repository/PhabricatorRepositoryConfigOptions.php

src/applications/repository/application/PhabricatorApplicationRepositories.php

src/applications/repository/conduit/ConduitAPI_repository_create_Method.php

src/applications/repository/controller/PhabricatorRepositoryCreateController.php

src/applications/repository/controller/PhabricatorRepositoryEditController.php

src/applications/repository/controller/PhabricatorRepositoryListController.php

src/applications/repository/daemon/PhabricatorRepositoryPullLocalDaemon.php

src/applications/repository/editor/PhabricatorRepositoryEditor.php

src/applications/repository/engine/PhabricatorRepositoryEngine.php

src/applications/repository/engine/PhabricatorRepositoryPullEngine.php

src/applications/repository/engine/__tests__/PhabricatorWorkingCopyPullTestCase.php

src/applications/repository/engine/__tests__/PhabricatorWorkingCopyTestCase.php

src/applications/repository/response/PhabricatorVCSResponse.php

src/applications/repository/storage/PhabricatorRepository.php

src/applications/repository/storage/PhabricatorRepositoryCommit.php

src/applications/repository/storage/PhabricatorRepositoryTransaction.php

src/applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php

src/applications/repository/worker/PhabricatorRepositoryCommitOwnersWorker.php

src/applications/repository/worker/commitchangeparser/PhabricatorRepositoryCommitChangeParserWorker.php

src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php

src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php

src/infrastructure/ssh/PhabricatorSSHWorkflow.php

src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php

src/view/form/control/AphrontFormPolicyControl.php

Merge branch 'master' of github.com:facebook/phabricator
Audited00d9aae894fb
Actions

src/applications/repository/engine/tests/PhabricatorWorkingCopyPullTestCase.php

src/applications/repository/engine/tests/PhabricatorWorkingCopyTestCase.php