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

Description

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

Details

Group Auditors

Provenance

chad	Authored on Nov 6 2013, 3:05 AM

Parents

rPf691e35195f4: Add Fluid-ish view to AphrontMultiColumnView
rPebcd60eae557: Fix an issue with non-bare Git repositories and non-master branches

Branches

Unknown

Tags

Unknown

Event Timeline

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

Merged Changes

ebcd60eae557 Fix an issue with non-bare Git repositories and non-master branches
Author
epriestley
Browse Repository
No Builds
Audited
d5f41ef70ed0 Return HTTP 500, not HTTP 200, on exception pages
Author
epriestley
Revisions
D7507: Return HTTP 500, not HTTP 200, on exception pages
Browse Repository
No Builds
No Audits
ce48375951bd Don't throw when user tries to use an empty password via HTTP auth
Author
epriestley
Revisions
D7508: Don't throw when user tries to use an empty password via HTTP auth
Browse Repository
No Builds
No Audits
e4569e7e7e2e Implement interface for adding, editing and deleting build steps on plans.
Author
hach-que
Revisions
D7500: Implement interface for adding, editing and deleting build steps on plans.
Browse Repository
No Builds
No Audits
c514d34b9456 Add build step implementation infrastructure and sleep build step.
Author
hach-que
Revisions
D7499: Add build step implementation infrastructure and sleep build step.
Browse Repository
No Builds
No Audits
5c0edc935102 Land Revision button for hosted git repos
Author
avivey
Revisions
D7486: Land Revision button for hosted git repos
Browse Repository
No Builds
No Audits
ca5400d14bcb Implement basic Harbormaster daemon and start builds.
Author
hach-que
Revisions
D7498: Implement basic Harbormaster daemon and start builds.
Browse Repository
No Builds
No Audits
5cc26f065d3f Expand "local working copy" conditional check in Diffusion
Author
epriestley
Revisions
D7506: Expand "local working copy" conditional check in Diffusion
Browse Repository
No Builds
No Audits
71e6386a73b6 Fix issue with new branch query data getting used incorrectly
Author
epriestley
Browse Repository
No Builds
Audited

Changes (36)

Path

Size

resources/

sql/

patches/

20131105.buildstep.sql

src/

__phutil_library_map__.php

aphront/

configuration/

AphrontDefaultApplicationConfiguration.php

applications/

base/

controller/

PhabricatorController.php

differential/

DifferentialGetWorkingCopy.php

application/

PhabricatorApplicationDifferential.php

controller/

DifferentialRevisionLandController.php

landing

DifferentialLandingActionMenuEventListener.php

DifferentialLandingStrategy.php

DifferentialLandingToHostedGit.php

diffusion/

controller/

DiffusionController.php

DiffusionRepositoryEditMainController.php

request/

DiffusionGitRequest.php

DiffusionRequest.php

harbormaster/

application/

PhabricatorApplicationHarbormaster.php

controller/

HarbormasterBuildableApplyController.php

HarbormasterBuildableListController.php

HarbormasterBuildableViewController.php

HarbormasterPlanExecuteController.php

HarbormasterPlanViewController.php

HarbormasterStepAddController.php

HarbormasterStepDeleteController.php

HarbormasterStepEditController.php

query/

HarbormasterBuildQuery.php

HarbormasterBuildStepQuery.php

step

BuildStepImplementation.php

SleepBuildStepImplementation.php

storage/

HarbormasterBuildable.php

build/

HarbormasterBuild.php

configuration/

HarbormasterBuildStep.php

worker/

HarbormasterBuildWorker.php

HarbormasterRunnerWorker.php

repository/

daemon/

PhabricatorRepositoryPullLocalDaemon.php

infrastructure/

storage/

patch/

PhabricatorBuiltinPatchList.php

rPb6c88bd6c1aa

View Options

resources/sql/patches/20131105.buildstep.sql

View Options

src/__phutil_library_map__.php

View Options

src/aphront/configuration/AphrontDefaultApplicationConfiguration.php

View Options

src/applications/base/controller/PhabricatorController.php

View Options

src/applications/differential/DifferentialGetWorkingCopy.php

View Options

src/applications/differential/application/PhabricatorApplicationDifferential.php

View Options

src/applications/differential/controller/DifferentialRevisionLandController.php

View Options

src/applications/differential/landing/DifferentialLandingActionMenuEventListener.php

View Options

src/applications/differential/landing/DifferentialLandingStrategy.php

View Options

src/applications/differential/landing/DifferentialLandingToHostedGit.php

View Options

src/applications/diffusion/controller/DiffusionController.php

View Options

src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php

View Options

src/applications/diffusion/request/DiffusionGitRequest.php

View Options

src/applications/diffusion/request/DiffusionRequest.php

View Options

src/applications/harbormaster/application/PhabricatorApplicationHarbormaster.php

View Options

src/applications/harbormaster/controller/HarbormasterBuildableApplyController.php

View Options

src/applications/harbormaster/controller/HarbormasterBuildableListController.php

View Options

src/applications/harbormaster/controller/HarbormasterBuildableViewController.php

View Options

src/applications/harbormaster/controller/HarbormasterPlanExecuteController.php

View Options

src/applications/harbormaster/controller/HarbormasterPlanViewController.php

View Options

src/applications/harbormaster/controller/HarbormasterStepAddController.php

View Options

src/applications/harbormaster/controller/HarbormasterStepDeleteController.php

View Options

src/applications/harbormaster/controller/HarbormasterStepEditController.php

View Options

src/applications/harbormaster/query/HarbormasterBuildQuery.php

View Options

src/applications/harbormaster/query/HarbormasterBuildStepQuery.php

View Options

src/applications/harbormaster/step/BuildStepImplementation.php

View Options

src/applications/harbormaster/step/SleepBuildStepImplementation.php

View Options

src/applications/harbormaster/storage/HarbormasterBuildable.php

View Options

src/applications/harbormaster/storage/build/HarbormasterBuild.php

View Options

src/applications/harbormaster/storage/configuration/HarbormasterBuildStep.php

View Options

src/applications/harbormaster/worker/HarbormasterBuildWorker.php

View Options

src/applications/harbormaster/worker/HarbormasterRunnerWorker.php

View Options

src/applications/repository/daemon/PhabricatorRepositoryPullLocalDaemon.php

View Options

src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php

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

Description

Details

Event Timeline

Merged Changes

Changes (36)

rPb6c88bd6c1aa

resources/sql/patches/20131105.buildstep.sql

src/__phutil_library_map__.php

src/aphront/configuration/AphrontDefaultApplicationConfiguration.php

src/applications/base/controller/PhabricatorController.php

src/applications/differential/DifferentialGetWorkingCopy.php

src/applications/differential/application/PhabricatorApplicationDifferential.php

src/applications/differential/controller/DifferentialRevisionLandController.php

src/applications/differential/landing/DifferentialLandingActionMenuEventListener.php

src/applications/differential/landing/DifferentialLandingStrategy.php

src/applications/differential/landing/DifferentialLandingToHostedGit.php

src/applications/diffusion/controller/DiffusionController.php

src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php

src/applications/diffusion/request/DiffusionGitRequest.php

src/applications/diffusion/request/DiffusionRequest.php

src/applications/harbormaster/application/PhabricatorApplicationHarbormaster.php

src/applications/harbormaster/controller/HarbormasterBuildableApplyController.php

src/applications/harbormaster/controller/HarbormasterBuildableListController.php

src/applications/harbormaster/controller/HarbormasterBuildableViewController.php

src/applications/harbormaster/controller/HarbormasterPlanExecuteController.php

src/applications/harbormaster/controller/HarbormasterPlanViewController.php

src/applications/harbormaster/controller/HarbormasterStepAddController.php

src/applications/harbormaster/controller/HarbormasterStepDeleteController.php

src/applications/harbormaster/controller/HarbormasterStepEditController.php

src/applications/harbormaster/query/HarbormasterBuildQuery.php

src/applications/harbormaster/query/HarbormasterBuildStepQuery.php

src/applications/harbormaster/step/BuildStepImplementation.php

src/applications/harbormaster/step/SleepBuildStepImplementation.php

src/applications/harbormaster/storage/HarbormasterBuildable.php

src/applications/harbormaster/storage/build/HarbormasterBuild.php

src/applications/harbormaster/storage/configuration/HarbormasterBuildStep.php

src/applications/harbormaster/worker/HarbormasterBuildWorker.php

src/applications/harbormaster/worker/HarbormasterRunnerWorker.php

src/applications/repository/daemon/PhabricatorRepositoryPullLocalDaemon.php

src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php

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