Merge branch 'master' into redesign-2015

src/applications/spaces/application/PhabricatorSpacesApplication.php

@@ -31,11 +31,7 @@ final class PhabricatorSpacesApplication extends PhabricatorApplication {
   }
 
   public function canUninstall() {
-    return true;
-  }
-
-  public function isPrototype() {
-    return true;
+    return false;
   }
 
   public function getHelpDocumentationArticles(PhabricatorUser $viewer) {

src/applications/spaces/controller/PhabricatorSpacesNoAccessController.php

@@ -0,0 +1,20 @@
+<?php
+
+final class PhabricatorSpacesNoAccessController
+  extends PhabricatorSpacesController {
+
+  public function handleRequest(AphrontRequest $request) {
+    return $this->newDialog()
+      ->setTitle(pht('No Access to Spaces'))
+      ->appendParagraph(
+        pht(
+          'This install uses spaces to organize objects, but your account '.
+          'does not have access to any spaces.'))
+      ->appendParagraph(
+        pht(
+          'Ask someone to add you to a Space so you can view and create '.
+          'objects.'))
+      ->addCancelButton('/', pht('Drift Aimlessly'));
+  }
+
+}