revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-29 02:02:41 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:facebook/phabricator

Browse source
This commit is contained in:
epriestley 2011-03-14 12:33:39 -07:00
commit 2b6f16dccd
2 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
conf/default.conf.php
View file

@ -22,12 +22,6 @@ return array(
// Example: "http://phabricator.example.com/" // Example: "http://phabricator.example.com/"
'phabricator.base-uri' => null, 'phabricator.base-uri' => null,
// The Conduit URI for API access to this install. Normally this is just
// the 'base-uri' plus "/api/" (e.g. "http://phabricator.example.com/api/"),
// but make sure you specify 'https' if you have HTTPS configured.
'phabricator.conduit-uri' => null,
// The default PHID for users who haven't uploaded a profile image. It should // The default PHID for users who haven't uploaded a profile image. It should
// be 50x50px. // be 50x50px.
'user.default-profile-image-phid' => 'PHID-FILE-f57aaefce707fc4060ef', 'user.default-profile-image-phid' => 'PHID-FILE-f57aaefce707fc4060ef',

2
src/applications/people/controller/settings/PhabricatorUserSettingsController.php
View file

@ -171,8 +171,6 @@ class PhabricatorUserSettingsController extends PhabricatorPeopleController {
$notice = null; $notice = null;
} }
$host = PhabricatorEnv::getEnvConfig('phabricator.conduit-uri');
$cert_form = new AphrontFormView(); $cert_form = new AphrontFormView();
$cert_form $cert_form
->setUser($user) ->setUser($user)