diff --git a/src/applications/conduit/controller/PhabricatorConduitAPIController.php b/src/applications/conduit/controller/PhabricatorConduitAPIController.php index 878243c295..1f8930f6ac 100644 --- a/src/applications/conduit/controller/PhabricatorConduitAPIController.php +++ b/src/applications/conduit/controller/PhabricatorConduitAPIController.php @@ -43,6 +43,7 @@ final class PhabricatorConduitAPIController $log = new PhabricatorConduitMethodCallLog(); $log->setMethod($method); + $metadata = array(); try { diff --git a/src/applications/conduit/method/repository/ConduitAPI_repository_Method.php b/src/applications/conduit/method/repository/ConduitAPI_repository_Method.php index bfe0e73364..83adab1361 100644 --- a/src/applications/conduit/method/repository/ConduitAPI_repository_Method.php +++ b/src/applications/conduit/method/repository/ConduitAPI_repository_Method.php @@ -29,6 +29,7 @@ abstract class ConduitAPI_repository_Method extends ConduitAPIMethod { 'uri' => PhabricatorEnv::getProductionURI($repository->getURI()), 'remoteURI' => (string)$repository->getPublicRemoteURI(), 'tracking' => $repository->getDetail('tracking-enabled'), + 'description' => $repository->getDetail('description'), ); } diff --git a/src/applications/conduit/method/repository/ConduitAPI_repository_create_Method.php b/src/applications/conduit/method/repository/ConduitAPI_repository_create_Method.php index e0a5146f50..ec0f87f7d0 100644 --- a/src/applications/conduit/method/repository/ConduitAPI_repository_create_Method.php +++ b/src/applications/conduit/method/repository/ConduitAPI_repository_create_Method.php @@ -39,6 +39,7 @@ final class ConduitAPI_repository_create_Method 'name' => 'required string', 'vcs' => 'required enum', 'callsign' => 'required string', + 'description' => 'optional string', 'encoding' => 'optional string', 'tracking' => 'optional bool', 'uri' => 'optional string', @@ -53,7 +54,8 @@ final class ConduitAPI_repository_create_Method 'closeCommitsFilter' => 'optional list', 'pullFrequency' => 'optional int', 'defaultBranch' => 'optional string', - 'heraldEnabled' => 'optional bool', + 'heraldEnabled' => 'optional bool, default = true', + 'autocloseEnabled' => 'optional bool, default = true', 'svnUUID' => 'optional string', ); } @@ -107,6 +109,7 @@ final class ConduitAPI_repository_create_Method $details = array( 'encoding' => $request->getValue('encoding'), + 'description' => $request->getValue('description'), 'tracking-enabled' => (bool)$request->getValue('tracking', true), 'remote-uri' => $request->getValue('uri'), 'local-path' => $request->getValue('localPath'), @@ -123,6 +126,7 @@ final class ConduitAPI_repository_create_Method 'ssh-keyfile' => $request->getValue('sshKeyFile'), 'herald-disabled' => !$request->getValue('heraldEnabled', true), 'svn-subpath' => $request->getValue('svnSubpath'), + 'disable-autoclose' => !$request->getValue('autocloseEnabled', true), ); foreach ($details as $key => $value) {