archive/phabricator
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Fix bad conflict resolve

Browse Source 
Also fix wrong push capability check.
This commit is contained in:
Sergey Sharybin
2014-09-23 00:23:56 +06:00
parent c87e657412
commit dbd2f0d06f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/svnauth/rebuild_svnauth.php
View File

@@ -74,7 +74,7 @@ function handleSingleRepository(
$viewer, $viewer,
$repository); $repository);
$pushable = $policies[DiffusionCapabilityPush::CAPABILITY]; $pushable = $policies[DiffusionPushCapability::CAPABILITY];
$type = phid_get_type($pushable->getPHID()); $type = phid_get_type($pushable->getPHID());
// Make sure repository is always available for read-only access // Make sure repository is always available for read-only access

2
src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php
View File

@@ -383,7 +383,7 @@ final class DiffusionRepositoryEditMainController
pht('Editable By'), pht('Editable By'),
$descriptions[PhabricatorPolicyCapability::CAN_EDIT]); $descriptions[PhabricatorPolicyCapability::CAN_EDIT]);
$pushable = $descriptions[DiffusionCapabilityPush::CAPABILITY]; $pushable = $descriptions[DiffusionPushCapability::CAPABILITY];
$view->addProperty(pht('Pushable By'), $pushable); $view->addProperty(pht('Pushable By'), $pushable);
return $view; return $view;