Merge branch 'master' into redesign-2015

2015-06-10 07:44:58 -07:00
parent cbf1b1a9fa c075f7f63f
commit 57b898af9a
452 changed files with 10749 additions and 5241 deletions
--- a/src/applications/project/controller/PhabricatorProjectBoardViewController.php
+++ b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
@@ -163,7 +163,7 @@ final class PhabricatorProjectBoardViewController
        PhabricatorProjectObjectHasProjectEdgeType::EDGECONST,
        PhabricatorQueryConstraint::OPERATOR_AND,
        array($project->getPHID()))
-      ->setOrderBy(ManiphestTaskQuery::ORDER_PRIORITY)
+      ->setOrder(ManiphestTaskQuery::ORDER_PRIORITY)
      ->setViewer($viewer)
      ->execute();
    $tasks = mpull($tasks, null, 'getPHID');