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

Merge branch 'master' into blender-tweaks

Browse Source 
Conflicts:
	scripts/celerity_mapper.php
	src/__celerity_resource_map__.php
	src/applications/differential/controller/DifferentialDiffCreateController.php
	src/applications/diffusion/controller/DiffusionBrowseFileController.php
	src/applications/diffusion/controller/DiffusionRepositoryEditPolicyController.php
	src/applications/files/storage/PhabricatorFile.php
	src/applications/maniphest/controller/ManiphestTaskListController.php
	src/applications/project/controller/PhabricatorProjectController.php
	src/applications/project/controller/PhabricatorProjectProfileController.php
	src/applications/repository/storage/PhabricatorRepository.php
	webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadSource.js
This commit is contained in:
Sergey Sharybin
2014-02-03 15:32:22 +06:00
parent 9093816113 29b29c109d
commit 9453f29deb
1245 changed files with 49883 additions and 16928 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/applications/differential/controller/DifferentialDiffCreateController.php
View File

@@ -66,7 +66,7 @@ final class DifferentialDiffCreateController extends DifferentialController {
$arcanist_link,
phutil_tag('tt', array(), 'svn diff'),
phutil_tag('tt', array(), 'git diff'),
phutil_tag('tt', array(), 'hg diff'));
phutil_tag('tt', array(), 'hg diff --git'));
}
$form
@@ -92,18 +92,11 @@ final class DifferentialDiffCreateController extends DifferentialController {
$form_box = id(new PHUIObjectBoxView())
->setHeaderText(pht('Create New Diff'))
->setFormError($errors)
->setForm($form);
->setForm($form)
->setFormErrors($errors);
$crumbs = $this->buildApplicationCrumbs();
$crumbs->addCrumb(
id(new PhabricatorCrumbView())
->setName(pht('Create Diff')));
if ($errors) {
$errors = id(new AphrontErrorView())
->setErrors($errors);
}
$crumbs->addTextCrumb(pht('Create Diff'));
return $this->buildApplicationPage(
array(