Merge branch 'master' into redesign-2015

2015-06-22 12:26:41 -07:00
parent 3d075b5b0e 95fe4f9451
commit b55f9b6120
73 changed files with 1893 additions and 491 deletions
--- a/src/applications/spaces/application/PhabricatorSpacesApplication.php
+++ b/src/applications/spaces/application/PhabricatorSpacesApplication.php
@@ -74,11 +74,13 @@ final class PhabricatorSpacesApplication extends PhabricatorApplication {
      PhabricatorSpacesCapabilityDefaultView::CAPABILITY => array(
        'caption' => pht('Default view policy for newly created spaces.'),
        'template' => PhabricatorSpacesNamespacePHIDType::TYPECONST,
+        'capability' => PhabricatorPolicyCapability::CAN_VIEW,
      ),
      PhabricatorSpacesCapabilityDefaultEdit::CAPABILITY => array(
        'caption' => pht('Default edit policy for newly created spaces.'),
        'default' => PhabricatorPolicies::POLICY_ADMIN,
        'template' => PhabricatorSpacesNamespacePHIDType::TYPECONST,
+        'capability' => PhabricatorPolicyCapability::CAN_EDIT,
      ),
    );
  }