No OneTemporary
Actions

Size

197 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/conf/default.conf.php b/conf/default.conf.php
	index 0a5a000a4d..c6ef8d54df 100644
	--- a/conf/default.conf.php
	+++ b/conf/default.conf.php
	@@ -1,1345 +1,1347 @@
	<?php

	// IMPORTANT: DO NOT EDIT THIS FILE.
	// This file is no longer read by default, and your efforts will have no effect.
	// Follow the instructions in the documentation to configure Phabricator.

	return array(

	// The root URI which Phabricator is installed on.
	// Example: "http://phabricator.example.com/"
	'phabricator.base-uri' => null,

	// If you have multiple environments, provide the production environment URI
	// here so that emails, etc., generated in development/sandbox environments
	// contain the right links.
	'phabricator.production-uri' => null,

	// -- IMPORTANT! Security! -------------------------------------------------- //

	// IMPORTANT: By default, Phabricator serves files from the same domain the
	// application lives on. This is convenient but not secure: it creates a large
	// class of vulnerabilities which can not be generally mitigated.
	//
	// To avoid this, you should configure a second domain in the same way you
	// have the primary domain configured (e.g., point it at the same machine and
	// set up the same vhost rules) and provide it here. For instance, if your
	// primary install is on "http://www.phabricator-example.com/", you could
	// configure "http://www.phabricator-files.com/" and specify the entire
	// domain (with protocol) here. This will enforce that files are
	// served only from the alternate domain. Ideally, you should use a
	// completely separate domain name rather than just a different subdomain.
	//
	// It is STRONGLY RECOMMENDED that you configure this. Your install is NOT
	// SECURE unless you do so.
	'security.alternate-file-domain' => null,

	// Default key for HMAC digests where the key is not important (i.e., the
	// hash itself is secret). You can change this if you want (to any other
	// string), but doing so will break existing sessions and CSRF tokens.
	'security.hmac-key' => '[D\t~Y7eNmnQGJ;rnH6aF;m2!vJ8@v8C=Cs:aQS\.Qw',

	// If the web server responds to both HTTP and HTTPS requests but you want
	// users to connect with only HTTPS, you can set this to true to make
	// Phabricator redirect HTTP requests to HTTPS.
	//
	// Normally, you should just configure your server not to accept HTTP traffic,
	// but this setting may be useful if you originally used HTTP and have now
	// switched to HTTPS but don't want to break old links, or if your webserver
	// sits behind a load balancer which terminates HTTPS connections and you
	// can not reasonably configure more granular behavior there.
	//
	// NOTE: Phabricator determines if a request is HTTPS or not by examining the
	// PHP $_SERVER['HTTPS'] variable. If you run Apache/mod_php this will
	// probably be set correctly for you automatically, but if you run Phabricator
	// as CGI/FCGI (e.g., through nginx or lighttpd), you need to configure your
	// web server so that it passes the value correctly based on the connection
	// type. Alternatively, you can add a PHP snippet to the top of this
	// configuration file to directly set $_SERVER['HTTPS'] to the correct value.
	'security.require-https' => false,

	// Is Phabricator permitted to make outbound HTTP requests?
	'security.allow-outbound-http' => true,


	// -- Internationalization -------------------------------------------------- //

	// This allows customizing texts used in Phabricator. The class must extend
	// PhabricatorTranslation.
	'translation.provider' => 'PhabricatorEnglishTranslation',

	// You can use 'translation.override' if you don't want to create a full
	// translation to give users an option for switching to it and you just want
	// to override some strings in the default translation.
	'translation.override' => array(),


	// -- Access Policies ------------------------------------------------------- //

	// Phabricator allows you to set the visibility of objects (like repositories
	// and source code) to "Public", which means anyone on the internet can see
	// them, even without being logged in. This is great for open source, but
	// some installs may never want to make anything public, so this policy is
	// disabled by default. You can enable it here, which will let you set the
	// policy for objects to "Public". With this option disabled, the most open
	// policy is "All Users", which means users must be logged in to view things.
	'policy.allow-public' => false,


	// -- Logging --------------------------------------------------------------- //

	// To enable the Phabricator access log, specify a path here. The Phabricator
	// access log can provide more detailed information about Phabricator access
	// than normal HTTP access logs (for instance, it can show logged-in users,
	// controllers, and other application data). If not set, no log will be
	// written.
	//
	// Make sure the PHP process can write to the log!
	'log.access.path' => null,

	// Format for the access log. If not set, the default format will be used:
	//
	// "[%D]\t%h\t%u\t%M\t%C\t%m\t%U\t%c\t%T"
	//
	// Available variables are:
	//
	// - %c The HTTP response code.
	// - %C The controller which handled the request.
	// - %D The request date.
	// - %e Epoch timestamp.
	// - %h The webserver's host name.
	// - %p The PID of the server process.
	// - %R The HTTP referrer.
	// - %r The remote IP.
	// - %T The request duration, in microseconds.
	// - %U The request path.
	// - %u The logged-in username, if one is logged in.
	// - %P The logged-in user PHID, if one is logged in.
	// - %M The HTTP method.
	// - %m For conduit, the Conduit method which was invoked.
	//
	// If a variable isn't available (for example, %m appears in the file format
	// but the request is not a Conduit request), it will be rendered as "-".
	//
	// Note that the default format is subject to change in the future, so if you
	// rely on the log's format, specify it explicitly.
	'log.access.format' => null,


	// -- DarkConsole ----------------------------------------------------------- //

	// DarkConsole is a administrative debugging/profiling tool built into
	// Phabricator. You can leave it disabled unless you're developing against
	// Phabricator.

	// Determines whether or not DarkConsole is available. DarkConsole exposes
	// some data like queries and stack traces, so you should be careful about
	// turning it on in production (although users can not normally see it, even
	// if the deployment configuration enables it).
	'darkconsole.enabled' => false,

	// Always enable DarkConsole, even for logged out users. This potentially
	// exposes sensitive information to users, so make sure untrusted users can
	// not access an install running in this mode. You should definitely leave
	// this off in production. It is only really useful for using DarkConsole
	// utilities to debug or profile logged-out pages. You must set
	// 'darkconsole.enabled' to use this option.
	'darkconsole.always-on' => false,

	// Map of additional configuration values to lock.
	'config.lock' => array(),

	// Map of additional configuration values to hide.
	'config.hide' => array(),

	// Map of additional configuration values to mask.
	'config.mask' => array(),

	// Ignore setup warnings of the following issues.
	'config.ignore-issues' => array(),

	// -- MySQL --------------------------------------------------------------- //

	// Class providing database configuration. It must implement
	// DatabaseConfigurationProvider.
	'mysql.configuration-provider' => 'DefaultDatabaseConfigurationProvider',

	// The username to use when connecting to MySQL.
	'mysql.user' => 'root',

	// The password to use when connecting to MySQL.
	'mysql.pass' => '',

	// The MySQL server to connect to. If you want to connect to a different
	// port than the default (which is 3306), specify it in the hostname
	// (e.g., db.example.com:1234).
	'mysql.host' => 'localhost',

	// Phabricator supports PHP extensions MySQL and MySQLi. It is possible to
	// implement also other access mechanism (e.g. PDO_MySQL). The class must
	// extend AphrontMySQLDatabaseConnectionBase.
	'mysql.implementation' => (extension_loaded('mysqli')
	? 'AphrontMySQLiDatabaseConnection'
	: 'AphrontMySQLDatabaseConnection'),


	// -- Notifications --------------------------------------------------------- //

	// Set this to true to enable real-time notifications. You must also run a
	// notification server for this to work. Consult the documentation in
	// "Notifications User Guide: Setup and Configuration" for instructions.
	'notification.enabled' => false,

	// Client port for the realtime server to listen on, and for realtime clients
	// to connect to. Use "localhost" if you are running the notification server
	// on the same host as the web server.
	'notification.client-uri' => 'http://localhost:22280/',

	// URI and port for the notification root server.
	'notification.server-uri' => 'http://localhost:22281/',

	// The server must be started as root so it can bind to privileged ports, but
	// if you specify a user here it will drop permissions after binding.
	'notification.user' => null,

	// Location where the server should log to.
	'notification.log' => '/var/log/aphlict.log',

	// PID file to use.
	'notification.pidfile' => '/var/run/aphlict.pid',

	// Enable this option to get additional debug output in the browser.
	'notification.debug' => false,


	// -- Email ----------------------------------------------------------------- //

	// Some Phabricator tools send email notifications, e.g. when Differential
	// revisions are updated or Maniphest tasks are changed. These options allow
	// you to configure how email is delivered.

	// You can test your mail setup by going to "MetaMTA" in the web interface,
	// clicking "Send New Message", and then composing a message.

	// Default address to send mail "From".
	'metamta.default-address' => 'noreply@example.com',

	// Domain used to generate Message-IDs.
	'metamta.domain' => 'example.com',

	// When a message is sent to multiple recipients (for example, several
	// reviewers on a code review), Phabricator can either deliver one email to
	// everyone (e.g., "To: alincoln, usgrant, htaft") or separate emails to each
	// user (e.g., "To: alincoln", "To: usgrant", "To: htaft"). The major
	// advantages and disadvantages of each approach are:
	//
	// - One mail to everyone:
	// - Recipients can see To/Cc at a glance.
	// - If you use mailing lists, you won't get duplicate mail if you're
	// a normal recipient and also Cc'd on a mailing list.
	// - Getting threading to work properly is harder, and probably requires
	// making mail less useful by turning off options.
	// - Sometimes people will "Reply All" and everyone will get two mails,
	// one from the user and one from Phabricator turning their mail into
	// a comment.
	// - Not supported with a private reply-to address.
	// - Mails are sent in the server default translation.
	// - One mail to each user:
	// - Recipients need to look in the mail body to see To/Cc.
	// - If you use mailing lists, recipients may sometimes get duplicate
	// mail.
	// - Getting threading to work properly is easier, and threading settings
	// can be customzied by each user.
	// - "Reply All" no longer spams all other users.
	// - Required if private reply-to addresses are configured.
	// - Mails are sent in the language of user preference.
	//
	// In the code, splitting one outbound email into one-per-recipient is
	// sometimes referred to as "multiplexing".
	'metamta.one-mail-per-recipient' => true,

	// When sending a message that has no To recipient (i.e. all recipients
	// are CC'd, for example when multiplexing mail), set the To field to the
	// following value. If no value is set, messages with no To will have
	// their CCs upgraded to To.
	'metamta.placeholder-to-recipient' => null,

	// When a user takes an action which generates an email notification (like
	// commenting on a Differential revision), Phabricator can either send that
	// mail "From" the user's email address (like "alincoln@logcabin.com") or
	// "From" the 'metamta.default-address' address. The user experience is
	// generally better if Phabricator uses the user's real address as the "From"
	// since the messages are easier to organize when they appear in mail clients,
	// but this will only work if the server is authorized to send email on behalf
	// of the "From" domain. Practically, this means:
	// - If you are doing an install for Example Corp and all the users will
	// have corporate @corp.example.com addresses and any hosts Phabricator
	// is running on are authorized to send email from corp.example.com,
	// you can enable this to make the user experience a little better.
	// - If you are doing an install for an open source project and your
	// users will be registering via Facebook and using personal email
	// addresses, you MUST NOT enable this or virtually all of your outgoing
	// email will vanish into SFP blackholes.
	// - If your install is anything else, you're much safer leaving this
	// off since the risk in turning it on is that your outgoing mail will
	// mostly never arrive.
	'metamta.can-send-as-user' => false,

	// Adapter class to use to transmit mail to the MTA. The default uses
	// PHPMailerLite, which will invoke "sendmail". This is appropriate
	// if sendmail actually works on your host, but if you haven't configured mail
	// it may not be so great. A number of other mailers are available (e.g., SES,
	// SendGrid, SMTP, custom mailers), consult "Configuring Outbound Email" in
	// the documentation for details.
	'metamta.mail-adapter' =>
	'PhabricatorMailImplementationPHPMailerLiteAdapter',

	// When email is sent, try to hand it off to the MTA immediately instead of
	// queueing it for delivery by the daemons. If you are running the Phabricator
	// daemons with "phd start", you should disable this to provide a (sometimes
	// substantial) performance boost. It's on by default to make setup and
	// configuration a little easier.
	'metamta.send-immediately' => true,

	// When email is sent, what format should Phabricator use for user's
	// email addresses? Valid values are:
	// - 'short' - 'gwashington <gwashington@example.com>'
	// - 'real' - 'George Washington <gwashington@example.com>'
	// - 'full' - 'gwashington (George Washington) <gwashington@example.com>'
	// The default is 'full'.
	'metamta.user-address-format' => 'full',

	// If you're using PHPMailer to send email, provide the mailer and options
	// here. PHPMailer is much more enormous than PHPMailerLite, and provides more
	// mailers and greater enormity. You need it when you want to use SMTP
	// instead of sendmail as the mailer.
	'phpmailer.mailer' => 'smtp',
	'phpmailer.smtp-host' => '',
	'phpmailer.smtp-port' => 25,

	// When using PHPMailer with SMTP, you can set this to one of "tls" or "ssl"
	// to use TLS or SSL. Leave it blank for vanilla SMTP. If you're sending
	// via Gmail, set it to "ssl".
	'phpmailer.smtp-protocol' => '',

	// Set following if your smtp server requires authentication.
	'phpmailer.smtp-user' => null,
	'phpmailer.smtp-password' => null,

	// If you're using Amazon SES to send email, provide your AWS access key
	// and AWS secret key here. To set up Amazon SES with Phabricator, you need
	// to:
	// - Make sure 'metamta.mail-adapter' is set to:
	// "PhabricatorMailImplementationAmazonSESAdapter"
	// - Make sure 'metamta.can-send-as-user' is false.
	// - Make sure 'metamta.default-address' is configured to something sensible.
	// - Make sure 'metamta.default-address' is a validated SES "From" address.
	'amazon-ses.access-key' => null,
	'amazon-ses.secret-key' => null,

	// If you're using Sendgrid to send email, provide your access credentials
	// here. This will use the REST API. You can also use Sendgrid as a normal
	// SMTP service.
	'sendgrid.api-user' => null,
	'sendgrid.api-key' => null,

	// You can configure a reply handler domain so that email sent from Maniphest
	// will have a special "Reply To" address like "T123+82+af19f@example.com"
	// that allows recipients to reply by email and interact with tasks. For
	// instructions on configurating reply handlers, see the article
	// "Configuring Inbound Email" in the Phabricator documentation. By default,
	// this is set to 'null' and Phabricator will use a generic 'noreply@' address
	// or the address of the acting user instead of a special reply handler
	// address (see 'metamta.default-address'). If you set a domain here,
	// Phabricator will begin generating private reply handler addresses. See
	// also 'metamta.maniphest.reply-handler' to further configure behavior.
	// This key should be set to the domain part after the @, like "example.com".
	'metamta.maniphest.reply-handler-domain' => null,

	// You can follow the instructions in "Configuring Inbound Email" in the
	// Phabricator documentation and set 'metamta.maniphest.reply-handler-domain'
	// to support updating Maniphest tasks by email. If you want more advanced
	// customization than this provides, you can override the reply handler
	// class with an implementation of your own. This will allow you to do things
	// like have a single public reply handler or change how private reply
	// handlers are generated and validated.
	//
	// This key should be set to a loadable subclass of
	// PhabricatorMailReplyHandler.
	'metamta.maniphest.reply-handler' => 'ManiphestReplyHandler',

	// If you don't want phabricator to take up an entire domain
	// (or subdomain for that matter), you can use this and set a common
	// prefix for mail sent by phabricator. It will make use of the fact that
	// a mail-address such as phabricator+D123+1hjk213h@example.com will be
	// delivered to the phabricator users mailbox.
	// Set this to the left part of the email address and it well get
	// prepended to all outgoing mail. If you want to use e.g.
	// 'phabricator@example.com' this should be set to 'phabricator'.
	'metamta.single-reply-handler-prefix' => null,

	// Prefix prepended to mail sent by Maniphest. You can change this to
	// distinguish between testing and development installs, for example.
	'metamta.maniphest.subject-prefix' => '[Maniphest]',

	// See 'metamta.maniphest.reply-handler-domain'. This does the same thing, but
	// affects Pholio.
	'metamta.pholio.reply-handler-domain' => null,

	// Prefix prepended to mail sent by Pholio.
	'metamta.pholio.subject-prefix' => '[Pholio]',

	// See 'metamta.maniphest.reply-handler-domain'. This does the same thing, but
	// affects Macro.
	'metamta.macro.reply-handler-domain' => null,

	// Prefix prepended to mail sent by Macro.
	'metamta.macro.subject-prefix' => '[Macro]',

	// See 'metamta.maniphest.reply-handler-domain'. This does the same thing,
	// but allows email replies via Differential.
	'metamta.differential.reply-handler-domain' => null,

	// See 'metamta.maniphest.reply-handler'. This does the same thing, but
	// affects Differential.
	'metamta.differential.reply-handler' => 'DifferentialReplyHandler',

	// Prefix prepended to mail sent by Differential.
	'metamta.differential.subject-prefix' => '[Differential]',

	// Set this to true if you want patches to be attached to mail from
	// Differential. This won't work if you are using SendGrid as your mail
	// adapter.
	'metamta.differential.attach-patches' => false,

	// To include patches in email bodies, set this to a positive integer. Patches
	// will be inlined if they are at most that many lines. For instance, a value
	// of 100 means "inline patches if they are no longer than 100 lines". By
	// default, patches are not inlined.
	'metamta.differential.inline-patches' => 0,

	// If you enable either of the options above, you can choose what format
	// patches are sent in. Valid options are 'unified' (like diff -u) or 'git'.
	'metamta.differential.patch-format' => 'unified',

	// Enables a different format for comments in differential emails.
	// Differential will create unified diffs around the comment, which
	// will give enough context for people who are only viewing the
	// reviews in email to understand what is going on. The context will
	// be created based on the range of the comment.
	'metamta.differential.unified-comment-context' => false,

	// Prefix prepended to mail sent by Diffusion.
	'metamta.diffusion.subject-prefix' => '[Diffusion]',

	// See 'metamta.maniphest.reply-handler-domain'. This does the same thing,
	// but allows email replies via Diffusion.
	'metamta.diffusion.reply-handler-domain' => null,

	// See 'metamta.maniphest.reply-handler'. This does the same thing, but
	// affects Diffusion.
	'metamta.diffusion.reply-handler' => 'PhabricatorAuditReplyHandler',

	// Set this to true if you want patches to be attached to commit notifications
	// from Diffusion. This won't work with SendGrid.
	'metamta.diffusion.attach-patches' => false,

	// To include patches in Diffusion email bodies, set this to a positive
	// integer. Patches will be inlined if they are at most that many lines.
	// By default, patches are not inlined.
	'metamta.diffusion.inline-patches' => 0,

	// If you've enabled attached patches or inline patches for commit emails, you
	// can establish a hard byte limit on their size. You should generally set
	// reasonable byte and time limits (defaults are 1MB and 60 seconds) to avoid
	// sending ridiculously enormous email for changes like "importing an external
	// library" or "accidentally committed this full-length movie as text".
	'metamta.diffusion.byte-limit' => 1024 * 1024,

	// If you've enabled attached patches or inline patches for commit emails, you
	// can establish a hard time limit on generating them.
	'metamta.diffusion.time-limit' => 60,

	// Prefix prepended to mail sent by Package.
	'metamta.package.subject-prefix' => '[Package]',

	// See 'metamta.maniphest.reply-handler'. This does similar thing for package
	// except that it only supports sending out mail and doesn't handle incoming
	// email.
	'metamta.package.reply-handler' => 'OwnersPackageReplyHandler',

	// By default, Phabricator generates unique reply-to addresses and sends a
	// separate email to each recipient when you enable reply handling. This is
	// more secure than using "From" to establish user identity, but can mean
	// users may receive multiple emails when they are on mailing lists. Instead,
	// you can use a single, non-unique reply to address and authenticate users
	// based on the "From" address by setting this to 'true'. This trades away
	// a little bit of security for convenience, but it's reasonable in many
	// installs. Object interactions are still protected using hashes in the
	// single public email address, so objects can not be replied to blindly.
	'metamta.public-replies' => false,

	// You can configure an email address like "bugs@phabricator.example.com"
	// which will automatically create Maniphest tasks when users send email
	// to it. This relies on the "From" address to authenticate users, so it is
	// is not completely secure. To set this up, enter a complete email
	// address like "bugs@phabricator.example.com" and then configure mail to
	// that address so it routed to Phabricator (if you've already configured
	// reply handlers, you're probably already done). See "Configuring Inbound
	// Email" in the documentation for more information.
	'metamta.maniphest.public-create-email' => null,

	// If you enable 'metamta.public-replies', Phabricator uses "From" to
	// authenticate users. You can additionally enable this setting to try to
	// authenticate with 'Reply-To'. Note that this is completely spoofable and
	// insecure (any user can set any 'Reply-To' address) but depending on the
	// nature of your install or other deliverability conditions this might be
	// okay. Generally, you can't do much more by spoofing Reply-To than be
	// annoying (you can write but not read content). But, you know, this is
	// still COMPLETELY INSECURE.
	'metamta.insecure-auth-with-reply-to' => false,

	// If you enable 'metamta.maniphest.public-create-email' and create an
	// email address like "bugs@phabricator.example.com", it will default to
	// rejecting mail which doesn't come from a known user. However, you might
	// want to let anyone send email to this address; to do so, set a default
	// author here (a Phabricator username). A typical use of this might be to
	// create a "System Agent" user called "bugs" and use that name here. If you
	// specify a valid username, mail will always be accepted and used to create
	// a task, even if the sender is not a system user. The original email
	// address will be stored in an 'From Email' field on the task.
	'metamta.maniphest.default-public-author' => null,

	// You can disable the Herald hints in email if users prefer smaller messages.
	// These are the links under the headers "MANAGE HERALD RULES" and
	// "WHY DID I GET THIS EMAIL?". If you set this to true, they will not appear
	// in any mail. Users can still navigate to the links via the web interface.
	'metamta.herald.show-hints' => true,

	// You can disable the hints under "REPLY HANDLER ACTIONS" if users prefer
	// smaller messages. The actions themselves will still work properly.
	'metamta.reply.show-hints' => true,

	// You can disable the "To:" and "Cc:" footers in mail if users prefer
	// smaller messages.
	'metamta.recipients.show-hints' => true,

	// If this option is enabled, Phabricator will add a "Precedence: bulk"
	// header to transactional mail (e.g., Differential, Maniphest and Herald
	// notifications). This may improve the behavior of some auto-responder
	// software and prevent it from replying. However, it may also cause
	// deliverability issues -- notably, you currently can not send this header
	// via Amazon SES, and enabling this option with SES will prevent delivery
	// of any affected mail.
	'metamta.precedence-bulk' => false,

	// Mail.app on OS X Lion won't respect threading headers unless the subject
	// is prefixed with "Re:". If you enable this option, Phabricator will add
	// "Re:" to the subject line of all mail which is expected to thread. If
	// you've set 'metamta.one-mail-per-recipient', users can override this
	// setting in their preferences.
	'metamta.re-prefix' => false,

	// If true, allow MetaMTA to change mail subjects to put text like
	// '[Accepted]' and '[Commented]' in them. This makes subjects more useful,
	// but might break threading on some clients. If you've set
	// 'metamta.one-mail-per-recipient', users can override this setting in their
	// preferences.
	'metamta.vary-subjects' => true,


	// -- Auth ------------------------------------------------------------------ //

	// Can users login with a username/password, or by following the link from
	// a password reset email? You can disable this and configure one or more
	// OAuth providers instead.
	'auth.password-auth-enabled' => true,

	// Maximum number of simultaneous web sessions each user is permitted to have.
	// Setting this to "1" will prevent a user from logging in on more than one
	// browser at the same time.
	'auth.sessions.web' => 5,

	// Maximum number of simultaneous Conduit sessions each user is permitted
	// to have.
	'auth.sessions.conduit' => 5,

	// Set this true to enable the Settings -> SSH Public Keys panel, which will
	// allow users to associated SSH public keys with their accounts. This is only
	// really useful if you're setting up services over SSH and want to use
	// Phabricator for authentication; in most situations you can leave this
	// disabled.
	'auth.sshkeys.enabled' => false,

	// If true, email addresses must be verified (by clicking a link in an
	// email) before a user can login. By default, verification is optional
	// unless 'auth.email-domains' is nonempty (see below).
	'auth.require-email-verification' => false,

	// You can restrict allowed email addresses to certain domains (like
	// "yourcompany.com") by setting a list of allowed domains here. Users will
	// only be allowed to register using email addresses at one of the domains,
	// and will only be able to add new email addresses for these domains. If
	// you configure this, it implies 'auth.require-email-verification'.
	//
	// To configure email domains, set a list of domains like this:
	//
	// array(
	// 'yourcompany.com',
	// 'yourcompany.co.uk',
	// )
	//
	// You should omit the "@" from domains. Note that the domain must match
	// exactly. If you allow "yourcompany.com", that permits "joe@yourcompany.com"
	// but rejects "joe@mail.yourcompany.com".
	'auth.email-domains' => array(),

	// You can provide an arbitrary block of HTML here, which will appear on the
	// login screen. Normally, you'd use this to provide login or registration
	// instructions to users.
	'auth.login-message' => null,


	// -- Accounts -------------------------------------------------------------- //

	// Is basic account information (email, real name, profile picture) editable?
	// If you set up Phabricator to automatically synchronize account information
	// from some other authoritative system, you can disable this to ensure
	// information remains consistent across both systems.
	'account.editable' => true,

	// When users set or reset a password, it must have at least this many
	// characters.
	'account.minimum-password-length' => 8,


	// -- Facebook OAuth -------------------------------------------------------- //

	// Can users use Facebook credentials to login to Phabricator?
	'facebook.auth-enabled' => false,

	// Can users use Facebook credentials to create new Phabricator accounts?
	'facebook.registration-enabled' => true,

	// Are Facebook accounts permanently linked to Phabricator accounts, or can
	// the user unlink them?
	'facebook.auth-permanent' => false,

	// The Facebook "Application ID" to use for Facebook API access.
	'facebook.application-id' => null,

	// The Facebook "Application Secret" to use for Facebook API access.
	'facebook.application-secret' => null,

	// Should Phabricator reject requests made by users with
	// Secure Browsing disabled?
	'facebook.require-https-auth' => false,

	// -- GitHub OAuth ---------------------------------------------------------- //

	// Can users use GitHub credentials to login to Phabricator?
	'github.auth-enabled' => false,

	// Can users use GitHub credentials to create new Phabricator accounts?
	'github.registration-enabled' => true,

	// Are GitHub accounts permanently linked to Phabricator accounts, or can
	// the user unlink them?
	'github.auth-permanent' => false,

	// The GitHub "Client ID" to use for GitHub API access.
	'github.application-id' => null,

	// The GitHub "Secret" to use for GitHub API access.
	'github.application-secret' => null,


	// -- Google OAuth ---------------------------------------------------------- //

	// Can users use Google credentials to login to Phabricator?
	'google.auth-enabled' => false,

	// Can users use Google credentials to create new Phabricator accounts?
	'google.registration-enabled' => true,

	// Are Google accounts permanently linked to Phabricator accounts, or can
	// the user unlink them?
	'google.auth-permanent' => false,

	// The Google "Client ID" to use for Google API access.
	'google.application-id' => null,

	// The Google "Client Secret" to use for Google API access.
	'google.application-secret' => null,

	// -- LDAP Auth ----------------------------------------------------- //
	// Enable ldap auth
	'ldap.auth-enabled' => false,

	// The LDAP server hostname
	'ldap.hostname' => null,

	// The LDAP server port
	'ldap.port' => 389,

	// The LDAP base domain name
	'ldap.base_dn' => null,

	// The attribute to be regarded as 'username'. Has to be unique
	'ldap.search_attribute' => null,

	// Perform a search to find a user
	// Many LDAP installations do not have the username in the dn, if this is
	// true for you set this to true and configure the username_attribute below
	'ldap.search-first' => false,

	// The attribute to search for if you have to search for a user
	'ldap.username-attribute' => null,

	// The attribute(s) to be regarded as 'real name'.
	// If more then one attribute is supplied the values of the attributes in
	// the array will be joined
	'ldap.real_name_attributes' => array(),

	// A domain name to use when authenticating against Active Directory
	// (e.g. 'example.com')
	'ldap.activedirectory_domain' => null,

	// The LDAP version
	'ldap.version' => 3,

	// LDAP Referrals Option
	// Whether referrals should be followed by the client
	// Should be set to 0 if you use Windows 2003 AD
	'ldap.referrals' => true,

	// The anonymous user name to use before searching a user.
	// Many LDAP installations require login even before searching a user, set
	// this option to enable it.
	'ldap.anonymous-user-name' => null,

	// The password of the LDAP anonymous user.
	'ldap.anonymous-user-password' => null,

	// Whether to use STARTTLS
	'ldap.start-tls' => false,


	// -- Disqus OAuth ---------------------------------------------------------- //

	// Can users use Disqus credentials to login to Phabricator?
	'disqus.auth-enabled' => false,

	// Can users use Disqus credentials to create new Phabricator accounts?
	'disqus.registration-enabled' => true,

	// Are Disqus accounts permanently linked to Phabricator accounts, or can
	// the user unlink them?
	'disqus.auth-permanent' => false,

	// The Disqus "Client ID" to use for Disqus API access.
	'disqus.application-id' => null,

	// The Disqus "Client Secret" to use for Disqus API access.
	'disqus.application-secret' => null,


	// -- Phabricator OAuth ----------------------------------------------------- //

	// Meta-town -- Phabricator is itself an OAuth Provider
	// TODO -- T887 -- make this support multiple Phabricator instances!

	// The URI of the Phabricator instance to use as an OAuth server.
	'phabricator.oauth-uri' => null,

	// Can users use Phabricator credentials to login to Phabricator?
	'phabricator.auth-enabled' => false,

	// Can users use Phabricator credentials to create new Phabricator accounts?
	'phabricator.registration-enabled' => true,

	// Are Phabricator accounts permanently linked to Phabricator accounts, or can
	// the user unlink them?
	'phabricator.auth-permanent' => false,

	// The Phabricator "Client ID" to use for Phabricator API access.
	'phabricator.application-id' => null,

	// The Phabricator "Client Secret" to use for Phabricator API access.
	'phabricator.application-secret' => null,


	// -- Recaptcha ------------------------------------------------------------- //

	// Is Recaptcha enabled? If disabled, captchas will not appear. You should
	// enable Recaptcha if your install is public-facing, as it hinders
	// brute-force attacks.
	'recaptcha.enabled' => false,

	// Your Recaptcha public key, obtained from Recaptcha.
	'recaptcha.public-key' => null,

	// Your Recaptcha private key, obtained from Recaptcha.
	'recaptcha.private-key' => null,


	// -- Misc ------------------------------------------------------------------ //

	// This is hashed with other inputs to generate CSRF tokens. If you want, you
	// can change it to some other string which is unique to your install. This
	// will make your install more secure in a vague, mostly theoretical way. But
	// it will take you like 3 seconds of mashing on your keyboard to set it up so
	// you might as well.
	'phabricator.csrf-key' => '0b7ec0592e0a2829d8b71df2fa269b2c6172eca3',

	// This is hashed with other inputs to generate mail tokens. If you want, you
	// can change it to some other string which is unique to your install. In
	// particular, you will want to do this if you accidentally send a bunch of
	// mail somewhere you shouldn't have, to invalidate all old reply-to
	// addresses.
	'phabricator.mail-key' => '5ce3e7e8787f6e40dfae861da315a5cdf1018f12',


	// PHP requires that you set a timezone in your php.ini before using date
	// functions, or it will emit a warning. If this isn't possible (for instance,
	// because you are using HPHP) you can set some valid constant for
	// date_default_timezone_set() here and Phabricator will set it on your
	// behalf, silencing the warning.
	'phabricator.timezone' => null,

	// Show stack traces when unhandled exceptions occur, force reloading of
	// static resources (skipping the cache), show an error callout if a page
	// generated PHP errors, warnings, or notices, force disk reads when
	// reloading, and generally make development easier. This option should not
	// be enabled in production.
	'phabricator.developer-mode' => false,

	// When users write comments which have URIs, they'll be automatically linked
	// if the protocol appears in this set. This whitelist is primarily to prevent
	// security issues like javascript:// URIs.
	'uri.allowed-protocols' => array(
	'http' => true,
	'https' => true,
	),

	// Tokenizers are UI controls which let the user select other users, email
	// addresses, project names, etc., by typing the first few letters and having
	// the control autocomplete from a list. They can load their data in two ways:
	// either in a big chunk up front, or as the user types. By default, the data
	// is loaded in a big chunk. This is simpler and performs better for small
	// datasets. However, if you have a very large number of users or projects,
	// (in the ballpark of more than a thousand), loading all that data may become
	// slow enough that it's worthwhile to query on demand instead. This makes
	// the typeahead slightly less responsive but overall performance will be much
	// better if you have a ton of stuff. You can figure out which setting is
	// best for your install by changing this setting and then playing with a
	// user tokenizer (like the user selectors in Maniphest or Differential) and
	// seeing which setting loads faster and feels better.
	'tokenizer.ondemand' => false,

	// By default, Phabricator includes some silly nonsense in the UI, such as
	// a submit button called "Clowncopterize" in Differential and a call to
	// "Leap Into Action". If you'd prefer more traditional UI strings like
	// "Submit", you can set this flag to disable most of the jokes and easter
	// eggs.
	'phabricator.serious-business' => false,

	// Should Phabricator show beta applications on the homepage
	'phabricator.show-beta-applications' => false,

	// Contains a list of uninstalled applications
	'phabricator.uninstalled-applications' => array(),

	// -- Welcome Screen -------------------------------------------------------- //

	// The custom HTML content for the Phabricator welcome screen.
	'welcome.html' => null,

	// -- Files ----------------------------------------------------------------- //

	// Lists which uploaded file types may be viewed in the browser. If a file
	// has a mime type which does not appear in this list, it will always be
	// downloaded instead of displayed. This is mainly a usability
	// consideration, since browsers tend to freak out when viewing enormous
	// binary files.
	//
	// The keys in this array are viewable mime types; the values are the mime
	// types they will be delivered as when they are viewed in the browser.
	//
	// IMPORTANT: Configure 'security.alternate-file-domain' above! Your install
	// is NOT safe if it is left unconfigured.
	'files.viewable-mime-types' => array(
	'image/jpeg' => 'image/jpeg',
	'image/jpg' => 'image/jpg',
	'image/png' => 'image/png',
	'image/gif' => 'image/gif',
	'text/plain' => 'text/plain; charset=utf-8',
	'text/x-diff' => 'text/plain; charset=utf-8',

	// ".ico" favicon files, which have mime type diversity. See:
	// http://en.wikipedia.org/wiki/ICO_(file_format)#MIME_type
	'image/x-ico' => 'image/x-icon',
	'image/x-icon' => 'image/x-icon',
	'image/vnd.microsoft.icon' => 'image/x-icon',
	),

	// List of mime types which can be used as the source for an <img /> tag.
	// This should be a subset of 'files.viewable-mime-types' and exclude files
	// like text.
	'files.image-mime-types' => array(
	'image/jpeg' => true,
	'image/jpg' => true,
	'image/png' => true,
	'image/gif' => true,
	'image/x-ico' => true,
	'image/x-icon' => true,
	'image/vnd.microsoft.icon' => true,
	),

	// Configuration option for enabling imagemagick
	// to resize animated profile pictures (gif)
	'files.enable-imagemagick' => false,

	// -- Storage --------------------------------------------------------------- //

	// Phabricator allows users to upload files, and can keep them in various
	// storage engines. This section allows you to configure which engines
	// Phabricator will use, and how it will use them.

	// The largest filesize Phabricator will store in the MySQL BLOB storage
	// engine, which just uses a database table to store files. While this isn't a
	// best practice, it's really easy to set up. Set this to 0 to disable use of
	// the MySQL blob engine.
	'storage.mysql-engine.max-size' => 1000000,

	// Phabricator provides a local disk storage engine, which just writes files
	// to some directory on local disk. The webserver must have read/write
	// permissions on this directory. This is straightforward and suitable for
	// most installs, but will not scale past one web frontend unless the path
	// is actually an NFS mount, since you'll end up with some of the files
	// written to each web frontend and no way for them to share. To use the
	// local disk storage engine, specify the path to a directory here. To
	// disable it, specify null.
	'storage.local-disk.path' => null,

	// If you want to store files in Amazon S3, specify an AWS access and secret
	// key here and a bucket name below.
	'amazon-s3.access-key' => null,
	'amazon-s3.secret-key' => null,

	// To use a custom endpoint, specify it here. Normally, you do not need to
	// configure this.
	'amazon-s3.endpoint' => null,

	// Set this to a valid Amazon S3 bucket to store files there. You must also
	// configure S3 access keys above.
	'storage.s3.bucket' => null,

	// Phabricator uses a storage engine selector to choose which storage engine
	// to use when writing file data. If you add new storage engines or want to
	// provide very custom rules (e.g., write images to one storage engine and
	// other files to a different one), you can provide an alternate
	// implementation here. The default engine will use choose MySQL, Local Disk,
	// and S3, in that order, if they have valid configurations above and a file
	// fits within configured limits.
	'storage.engine-selector' => 'PhabricatorDefaultFileStorageEngineSelector',

	// Set the size of the largest file a user may upload. This is used to render
	// text like "Maximum file size: 10MB" on interfaces where users can upload
	// files, and files larger than this size will be rejected.
	//
	// Specify this limit in bytes, or using a "K", "M", or "G" suffix.
	//
	// NOTE: Setting this to a large size is NOT sufficient to allow users to
	// upload large files. You must also configure a number of other settings. To
	// configure file upload limits, consult the article "Configuring File Upload
	// Limits" in the documentation. Once you've configured some limit across all
	// levels of the server, you can set this limit to an appropriate value and
	// the UI will then reflect the actual configured limit.
	'storage.upload-size-limit' => null,

	// Phabricator puts databases in a namespace, which defualts to "phabricator"
	// -- for instance, the Differential database is named
	// "phabricator_differential" by default. You can change this namespace if you
	// want. Normally, you should not do this unless you are developing
	// Phabricator and using namespaces to separate multiple sandbox datasets.
	'storage.default-namespace' => 'phabricator',


	// -- Search ---------------------------------------------------------------- //

	// Phabricator supports Elastic Search; to use it, specify a host like
	// 'http://elastic.example.com:9200/' here.
	'search.elastic.host' => null,

	// Phabricator uses a search engine selector to choose which search engine
	// to use when indexing and reconstructing documents, and when executing
	// queries. You can override the engine selector to provide a new selector
	// class which can select some custom engine you implement, if you want to
	// store your documents in some search engine which does not have default
	// support.
	'search.engine-selector' => 'PhabricatorDefaultSearchEngineSelector',


	// -- Differential ---------------------------------------------------------- //

	'differential.revision-custom-detail-renderer' => null,

	// Array for custom remarkup rules. The array should have a list of
	// class names of classes that extend PhutilRemarkupRule
	'differential.custom-remarkup-rules' => null,

	// Array for custom remarkup block rules. The array should have a list of
	// class names of classes that extend PhutilRemarkupEngineBlockRule
	'differential.custom-remarkup-block-rules' => null,

	// List of file regexps where whitespace is meaningful and should not
	// use 'ignore-all' by default
	'differential.whitespace-matters' => array(
	'/\.py$/',
	'/\.l?hs$/',
	),

	'differential.field-selector' => 'DifferentialDefaultFieldSelector',

	// Differential can show "Host" and "Path" fields on revisions, with
	// information about the machine and working directory where the
	// change came from. These fields are disabled by default because they may
	// occasionally have sensitive information; you can set this to true to
	// enable them.
	'differential.show-host-field' => false,

	// Differential has a required "Test Plan" field by default, which requires
	// authors to fill out information about how they verified the correctness of
	// their changes when sending code for review. If you'd prefer not to use
	// this field, you can disable it here. You can also make it optional
	// (instead of required) below.
	'differential.show-test-plan-field' => true,

	// Differential has a required "Test Plan" field by default. You can make it
	// optional by setting this to false. You can also completely remove it above,
	// if you prefer.
	'differential.require-test-plan-field' => true,

	// If you set this to true, users can "!accept" revisions via email (normally,
	// they can take other actions but can not "!accept"). This action is disabled
	// by default because email authentication can be configured to be very weak,
	// and, socially, email "!accept" is kind of sketchy and implies revisions may
	// not actually be receiving thorough review.
	'differential.enable-email-accept' => false,

	// If you set this to true, users won't need to login to view differential
	// revisions. Anonymous users will have read-only access and won't be able to
	// interact with the revisions.
	'differential.anonymous-access' => false,

	// List of file regexps that should be treated as if they are generated by
	// an automatic process, and thus get hidden by default in differential.
	'differential.generated-paths' => array(
	// '/config\.h$/',
	// '#/autobuilt/#',
	),

	// If you set this to true, users can accept their own revisions. This action
	// is disabled by default because it's most likely not a behavior you want,
	// but it proves useful if you are working alone on a project and want to make
	// use of all of differential's features.
	'differential.allow-self-accept' => false,

	// If you set this to true, any user can close any revision so long as it has
	// been accepted. This can be useful depending on your development model. For
	// example, github-style pull requests where the reviewer is often the
	// actual committer can benefit from turning this option to true. If false,
	// only the submitter can close a revision.
	'differential.always-allow-close' => false,

	// If you set this to true, any user can reopen a revision so long as it has
	// been closed. This can be useful if a revision is accidentally closed or
	// if a developer changes his or her mind after closing a revision. If it is
	// false, reopening is not allowed.
	'differential.allow-reopen' => false,

	// Revisions newer than this number of days are marked as fresh in Action
	// Required and Revisions Waiting on You views. Only work days (not weekends
	// and holidays) are included. Set to 0 to disable this feature.
	'differential.days-fresh' => 1,

	// Similar to 'differential.days-fresh' but marks stale revisions. If the
	// revision is even older than it is marked as old.
	'differential.days-stale' => 3,

	// -- Repositories ---------------------------------------------------------- //

	// The default location in which to store local copies of repositories.
	// Anything stored in this directory will be assumed to be under the
	// control of phabricator, which means that Phabricator will try to do some
	// maintenance on working copies if there are problems (such as a change
	// to the remote origin url). This maintenance may include completely
	// removing (and recloning) anything in this directory.
	//
	// When set to null, this option is ignored (i.e. Phabricator will not fully
	// control any working copies).
	'repository.default-local-path' => null,

	// -- Maniphest ------------------------------------------------------------- //

	+ // Deprecated, use 'phabricator.uninstalled-applications' instead.
	'maniphest.enabled' => true,

	// Array of custom fields for Maniphest tasks. For details on adding custom
	// fields to Maniphest, see "Maniphest User Guide: Adding Custom Fields".
	'maniphest.custom-fields' => array(),

	// Class which drives custom field construction. See "Maniphest User Guide:
	// Adding Custom Fields" in the documentation for more information.
	'maniphest.custom-task-extensions-class' => 'ManiphestDefaultTaskExtensions',

	// What should the default task priority be in create flows?
	// See the constants in @{class:ManiphestTaskPriority} for valid values.
	// Defaults to "needs triage".
	'maniphest.default-priority' => 90,

	// -- Phriction ------------------------------------------------------------- //

	+ // Deprecated, use 'phabricator.uninstalled-applications' instead.
	'phriction.enabled' => true,

	// -- Phame ----------------------------------------------------------------- //

	// Should Phame users have Disqus comment widget, and if so what's the
	// website shortname to use? For example, secure.phabricator.org uses
	// "phabricator", which we registered with Disqus. If you aren't familiar
	// with Disqus, see:
	// Disqus quick start guide - http://docs.disqus.com/help/4/
	// Information on shortnames - http://docs.disqus.com/help/68/
	'disqus.shortname' => null,

	// Directories to look for Phame skins inside of.
	'phame.skins' => array(
	'externals/skins/',
	),

	// -- Remarkup -------------------------------------------------------------- //

	// If you enable this, linked YouTube videos will be embeded inline. This has
	// mild security implications (you'll leak referrers to YouTube) and is pretty
	// silly (but sort of awesome).
	'remarkup.enable-embedded-youtube' => false,


	// -- Cache ----------------------------------------------------------------- //

	// Set this to false to disable the use of gzdeflate()-based compression in
	// some caches. This may give you less performant (but more debuggable)
	// caching.
	'cache.enable-deflate' => true,

	// -- Garbage Collection ---------------------------------------------------- //

	// Phabricator generates various logs and caches in the database which can
	// be garbage collected after a while to make the total data size more
	// manageable. To run garbage collection, launch a
	// PhabricatorGarbageCollector daemon.

	// These 'ttl' keys configure how much old data the GC daemon keeps around.
	// Objects older than the ttl will be collected. Set any value to 0 to store
	// data indefinitely.

	'gcdaemon.ttl.herald-transcripts' => 30 * (24 * 60 * 60),
	'gcdaemon.ttl.daemon-logs' => 7 * (24 * 60 * 60),
	'gcdaemon.ttl.differential-parse-cache' => 14 * (24 * 60 * 60),
	'gcdaemon.ttl.markup-cache' => 30 * (24 * 60 * 60),
	'gcdaemon.ttl.task-archive' => 14 * (24 * 60 * 60),
	'gcdaemon.ttl.general-cache' => 30 * (24 * 60 * 60),


	// -- Feed ------------------------------------------------------------------ //

	// If you set this to true, you can embed Phabricator activity feeds in other
	// pages using iframes. These feeds are completely public, and a login is not
	// required to view them! This is intended for things like open source
	// projects that want to expose an activity feed on the project homepage.
	//
	// NOTE: You must also set `policy.allow-public` to true for this setting
	// to work properly.
	'feed.public' => false,

	// If you set this to a list of http URIs, when a feed story is published a
	// task will be created for each uri that posts the story data to the uri.
	// Daemons automagically retry failures 100 times, waiting $fail_count * 60s
	// between each subsequent failure. Be sure to keep the daemon console
	// (/daemon/) open while developing and testing your end points.
	//
	// NOTE: URIs are not validated, the URI must return http status 200 within
	// 30 seconds, and no permission checks are performed.
	'feed.http-hooks' => array(),

	// -- Drydock --------------------------------------------------------------- //

	// If you want to use Drydock's builtin EC2 Blueprints, configure your AWS
	// EC2 credentials here.
	'amazon-ec2.access-key' => null,
	'amazon-ec2.secret-key' => null,


	// -- Customization --------------------------------------------------------- //

	// Paths to additional phutil libraries to load.
	'load-libraries' => array(),

	'aphront.default-application-configuration-class' =>
	'AphrontDefaultApplicationConfiguration',

	'controller.oauth-registration' =>
	'PhabricatorOAuthDefaultRegistrationController',


	// Directory that phd (the Phabricator daemon control script) should use to
	// track running daemons.
	'phd.pid-directory' => '/var/tmp/phd/pid',

	// Directory that the Phabricator daemons should use to store the log file
	'phd.log-directory' => '/var/tmp/phd/log',

	// Number of "TaskMaster" daemons that "phd start" should start. You can
	// raise this if you have a task backlog, or explicitly launch more with
	// "phd launch <N> taskmaster".
	'phd.start-taskmasters' => 4,

	// Launch daemons in "verbose" mode by default. This creates a lot of output,
	// but can help debug issues. Daemons launched in debug mode with "phd debug"
	// are always launched in verbose mode. See also 'phd.trace'.
	'phd.verbose' => false,

	// Launch daemons in "trace" mode by default. This creates an ENORMOUS amount
	// of output, but can help debug issues. Daemons launched in debug mode with
	// "phd debug" are always launched in trace mdoe. See also 'phd.verbose'.
	'phd.trace' => false,

	// Path to custom celerity resource map relative to 'phabricator/src'.
	// See also `scripts/celerity_mapper.php`.
	'celerity.resource-path' => '__celerity_resource_map__.php',

	// This value is an input to the hash function when building resource hashes.
	// It has no security value, but if you accidentally poison user caches (by
	// pushing a bad patch or having something go wrong with a CDN, e.g.) you can
	// change this to something else and rebuild the Celerity map to break user
	// caches. Unless you are doing Celerity development, it is exceptionally
	// unlikely that you need to modify this.
	'celerity.resource-hash' => 'd9455ea150622ee044f7931dabfa52aa',

	// Minify static resources by removing whitespace and comments. You should
	// enable this in production, but disable it in development.
	'celerity.minify' => false,

	// You can respond to various application events by installing listeners,
	// which will receive callbacks when interesting things occur. Specify a list
	// of classes which extend PhabricatorEventListener here.
	'events.listeners' => array(),

	// -- Syntax Highlighting --------------------------------------------------- //

	// Phabricator can highlight PHP by default and use Pygments for other
	// languages if enabled. You can provide a custom highlighter engine by
	// extending class PhutilSyntaxHighlighterEngine.
	'syntax-highlighter.engine' => 'PhutilDefaultSyntaxHighlighterEngine',

	// If you want syntax highlighting for other languages than PHP then you can
	// install the python package 'Pygments', make sure the 'pygmentize' script is
	// available in the $PATH of the webserver, and then enable this.
	'pygments.enabled' => false,

	// In places that we display a dropdown to syntax-highlight code,
	// this is where that list is defined.
	// Syntax is 'lexer-name' => 'Display Name',
	'pygments.dropdown-choices' => array(
	'apacheconf' => 'Apache Configuration',
	'bash' => 'Bash Scripting',
	'brainfuck' => 'Brainf*ck',
	'c' => 'C',
	'cpp' => 'C++',
	'css' => 'CSS',
	'd' => 'D',
	'diff' => 'Diff',
	'django' => 'Django Templating',
	'erb' => 'Embedded Ruby/ERB',
	'erlang' => 'Erlang',
	'haskell' => 'Haskell',
	'html' => 'HTML',
	'java' => 'Java',
	'js' => 'Javascript',
	'mysql' => 'MySQL',
	'objc' => 'Objective-C',
	'perl' => 'Perl',
	'php' => 'PHP',
	'rest' => 'reStructuredText',
	'text' => 'Plain Text',
	'python' => 'Python',
	'rainbow' => 'Rainbow',
	'remarkup' => 'Remarkup',
	'ruby' => 'Ruby',
	'xml' => 'XML',
	),

	// This is an override list of regular expressions which allows you to choose
	// what language files are highlighted as. If your projects have certain rules
	// about filenames or use unusual or ambiguous language extensions, you can
	// create a mapping here. This is an ordered dictionary of regular expressions
	// which will be tested against the filename. They should map to either an
	// explicit language as a string value, or a numeric index into the captured
	// groups as an integer.
	'syntax.filemap' => array(
	// Example: Treat all '*.xyz' files as PHP.
	// '@\\.xyz$@' => 'php',

	// Example: Treat 'httpd.conf' as 'apacheconf'.
	// '@/httpd\\.conf$@' => 'apacheconf',

	// Example: Treat all '*.x.bak' file as '.x'. NOTE: we map to capturing
	// group 1 by specifying the mapping as "1".
	// '@\\.([^.]+)\\.bak$@' => 1,

	'@\.arcconfig$@' => 'js',
	'@\.divinerconfig$@' => 'js',
	),

	// Set the default monospaced font style for users who haven't set a custom
	// style.
	'style.monospace' => '10px "Menlo", "Consolas", "Monaco", monospace',
	'style.monospace.windows' => '11px "Menlo", "Consolas", "Monaco", monospace',


	// -- Debugging ------------------------------------------------------------- //

	// Enable this to change HTTP redirects into normal pages with a link to the
	// redirection target. For example, after you submit a form you'll get a page
	// saying "normally, you'd be redirected...". This is useful to examine
	// service or profiler information on write pathways, or debug redirects. It
	// also makes the UX horrible for normal use, so you should enable it only
	// when debugging.
	//
	// NOTE: This does not currently work for forms with Javascript "workflow",
	// since the redirect happens in Javascript.
	'debug.stop-on-redirect' => false,

	// Set the rate for how often to do sampled profiling. On average, one
	// request for every number of requests specified here will be sampled.
	// Set this value to 0 to completely disable profiling. In a production
	// environment, this value should either be set to 0 (to disable) or to
	// a large number (to sample only a few requests).
	'debug.profile-rate' => 0,

	// -- Environment ---------------------------------------------------------- //

	// Phabricator occasionally shells out to other binaries on the server.
	// An example of this is the "pygmentize" command, used to syntax-highlight
	// code written in languages other than PHP. By default, it is assumed that
	// these binaries are in the $PATH of the user running Phabricator (normally
	// 'apache', 'httpd', or 'nobody'). Here you can add extra directories to
	// the $PATH environment variable, for when these binaries are in non-standard
	// locations.
	'environment.append-paths' => array(),

	// -- Audit ---------------------------------------------------------- //

	// Controls whether or not task creator can Close Audits
	'audit.can-author-close-audit' => false,
	);
	diff --git a/src/applications/base/PhabricatorApplication.php b/src/applications/base/PhabricatorApplication.php
	index 707f0476cc..070ef0c84b 100644
	--- a/src/applications/base/PhabricatorApplication.php
	+++ b/src/applications/base/PhabricatorApplication.php
	@@ -1,300 +1,296 @@
	<?php

	/**
	* @task info Application Information
	* @task ui UI Integration
	* @task uri URI Routing
	* @task fact Fact Integration
	* @task meta Application Management
	* @group apps
	*/
	abstract class PhabricatorApplication {

	const GROUP_CORE = 'core';
	const GROUP_COMMUNICATION = 'communication';
	const GROUP_ORGANIZATION = 'organization';
	const GROUP_UTILITIES = 'util';
	const GROUP_ADMIN = 'admin';
	const GROUP_DEVELOPER = 'developer';
	const GROUP_MISC = 'misc';

	const TILE_INVISIBLE = 'invisible';
	const TILE_HIDE = 'hide';
	const TILE_SHOW = 'show';
	const TILE_FULL = 'full';

	public static function getApplicationGroups() {
	return array(
	self::GROUP_CORE => pht('Core Applications'),
	self::GROUP_COMMUNICATION => pht('Communication'),
	self::GROUP_ORGANIZATION => pht('Organization'),
	self::GROUP_UTILITIES => pht('Utilities'),
	self::GROUP_ADMIN => pht('Administration'),
	self::GROUP_DEVELOPER => pht('Developer Tools'),
	self::GROUP_MISC => pht('Miscellaneous Applications'),
	);
	}

	public static function getTileDisplayName($constant) {
	$names = array(
	self::TILE_INVISIBLE => pht('Invisible'),
	self::TILE_HIDE => pht('Hidden'),
	self::TILE_SHOW => pht('Show Small Tile'),
	self::TILE_FULL => pht('Show Large Tile'),
	);
	return idx($names, $constant);
	}



	/* -( Application Information )-------------------------------------------- */


	public function getName() {
	return substr(get_class($this), strlen('PhabricatorApplication'));
	}

	public function getShortDescription() {
	return $this->getName().' Application';
	}

	- public function isEnabled() {
	- return true;
	- }
	-
	public function isInstalled() {
	if (!$this->canUninstall()) {
	return true;
	}

	$beta = PhabricatorEnv::getEnvConfig('phabricator.show-beta-applications');
	if (!$beta && $this->isBeta()) {
	return false;
	}

	$uninstalled = PhabricatorEnv::getEnvConfig(
	'phabricator.uninstalled-applications');

	return empty($uninstalled[get_class($this)]);
	}

	+ public static function isClassInstalled($class) {
	+ return self::getByClass($class)->isInstalled();
	+ }
	+
	public function isBeta() {
	return false;
	}

	public function canUninstall() {
	return true;
	}

	public function getPHID() {
	return 'PHID-APPS-'.get_class($this);
	}

	public function getTypeaheadURI() {
	return $this->getBaseURI();
	}

	public function getBaseURI() {
	return null;
	}

	public function getIconURI() {
	return null;
	}

	public function getIconName() {
	return 'application';
	}

	public function shouldAppearInLaunchView() {
	return true;
	}

	public function getApplicationOrder() {
	return PHP_INT_MAX;
	}

	public function getApplicationGroup() {
	return self::GROUP_MISC;
	}

	public function getTitleGlyph() {
	return null;
	}

	public function getHelpURI() {
	// TODO: When these applications get created, link to their docs:
	//
	// - Drydock
	// - OAuth Server


	return null;
	}

	public function getEventListeners() {
	return array();
	}

	public function getDefaultTileDisplay(PhabricatorUser $user) {
	switch ($this->getApplicationGroup()) {
	case self::GROUP_CORE:
	return self::TILE_FULL;
	case self::GROUP_UTILITIES:
	case self::GROUP_DEVELOPER:
	return self::TILE_HIDE;
	case self::GROUP_ADMIN:
	if ($user->getIsAdmin()) {
	return self::TILE_SHOW;
	} else {
	return self::TILE_INVISIBLE;
	}
	break;
	default:
	return self::TILE_SHOW;
	}
	}

	public function getRemarkupRules() {
	return array();
	}


	/* -( URI Routing )-------------------------------------------------------- */


	public function getRoutes() {
	return array();
	}


	/* -( Fact Integration )--------------------------------------------------- */


	public function getFactObjectsForAnalysis() {
	return array();
	}


	/* -( UI Integration )----------------------------------------------------- */


	/**
	* Render status elements (like "3 Waiting Reviews") for application list
	* views. These provide a way to alert users to new or pending action items
	* in applications.
	*
	* @param PhabricatorUser Viewing user.
	* @return list<PhabricatorApplicationStatusView> Application status elements.
	* @task ui
	*/
	public function loadStatus(PhabricatorUser $user) {
	return array();
	}


	/**
	* You can provide an optional piece of flavor text for the application. This
	* is currently rendered in application launch views if the application has no
	* status elements.
	*
	* @return string\|null Flavor text.
	* @task ui
	*/
	public function getFlavorText() {
	return null;
	}


	/**
	* Build items for the main menu.
	*
	* @param PhabricatorUser The viewing user.
	* @param AphrontController The current controller. May be null for special
	* pages like 404, exception handlers, etc.
	* @return list<PhabricatorMainMenuIconView> List of menu items.
	* @task ui
	*/
	public function buildMainMenuItems(
	PhabricatorUser $user,
	PhabricatorController $controller = null) {
	return array();
	}


	/**
	* On the Phabricator homepage sidebar, this function returns the URL for
	* a quick create X link which is displayed in the wide button only.
	*
	* @return string
	* @task ui
	*/
	public function getQuickCreateURI() {
	return null;
	}


	/* -( Application Management )--------------------------------------------- */

	public static function getByClass($class_name) {
	$selected = null;
	$applications = PhabricatorApplication::getAllApplications();

	foreach ($applications as $application) {
	if (get_class($application) == $class_name) {
	$selected = $application;
	break;
	}
	}
	return $selected;
	}

	public static function getAllApplications() {
	$classes = id(new PhutilSymbolLoader())
	->setAncestorClass(__CLASS__)
	->setConcreteOnly(true)
	->selectAndLoadSymbols();

	$apps = array();

	foreach ($classes as $class) {
	$app = newv($class['name'], array());
	$apps[] = $app;
	}

	// Reorder the applications into "application order". Notably, this ensures
	// their event handlers register in application order.
	$apps = msort($apps, 'getApplicationOrder');
	$apps = mgroup($apps, 'getApplicationGroup');
	$apps = array_select_keys($apps, self::getApplicationGroups()) + $apps;
	$apps = array_mergev($apps);

	return $apps;
	}

	public static function getAllInstalledApplications() {
	static $applications;

	if (empty($applications)) {
	$all_applications = self::getAllApplications();
	$apps = array();
	foreach ($all_applications as $app) {
	if (!$app->isInstalled()) {
	continue;
	}

	- if (!$app->isEnabled()) {
	- continue;
	- }
	-
	$apps[] = $app;
	}

	$applications = $apps;
	}

	return $applications;
	}

	}

	diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php
	index 3eb4e946cf..841b494445 100644
	--- a/src/applications/differential/controller/DifferentialRevisionViewController.php
	+++ b/src/applications/differential/controller/DifferentialRevisionViewController.php
	@@ -1,976 +1,977 @@
	<?php

	final class DifferentialRevisionViewController extends DifferentialController {

	private $revisionID;

	public function shouldRequireLogin() {
	return !$this->allowsAnonymousAccess();
	}

	public function willProcessRequest(array $data) {
	$this->revisionID = $data['id'];
	}

	public function processRequest() {

	$request = $this->getRequest();
	$user = $request->getUser();
	$viewer_is_anonymous = !$user->isLoggedIn();

	$revision = id(new DifferentialRevision())->load($this->revisionID);
	if (!$revision) {
	return new Aphront404Response();
	}

	$revision->loadRelationships();

	$diffs = $revision->loadDiffs();

	if (!$diffs) {
	throw new Exception(
	"This revision has no diffs. Something has gone quite wrong.");
	}

	$diff_vs = $request->getInt('vs');

	$target_id = $request->getInt('id');
	$target = idx($diffs, $target_id, end($diffs));

	$target_manual = $target;
	if (!$target_id) {
	foreach ($diffs as $diff) {
	if ($diff->getCreationMethod() != 'commit') {
	$target_manual = $diff;
	}
	}
	}

	if (empty($diffs[$diff_vs])) {
	$diff_vs = null;
	}

	$arc_project = $target->loadArcanistProject();
	$repository = ($arc_project ? $arc_project->loadRepository() : null);

	list($changesets, $vs_map, $vs_changesets, $rendering_references) =
	$this->loadChangesetsAndVsMap(
	$target,
	idx($diffs, $diff_vs),
	$repository);

	if ($request->getExists('download')) {
	return $this->buildRawDiffResponse(
	$changesets,
	$vs_changesets,
	$vs_map,
	$repository);
	}

	$props = id(new DifferentialDiffProperty())->loadAllWhere(
	'diffID = %d',
	$target_manual->getID());
	$props = mpull($props, 'getData', 'getName');

	$aux_fields = $this->loadAuxiliaryFields($revision);

	$comments = $revision->loadComments();
	$comments = array_merge(
	$this->getImplicitComments($revision, reset($diffs)),
	$comments);

	$all_changesets = $changesets;
	$inlines = $this->loadInlineComments($comments, $all_changesets);

	$object_phids = array_merge(
	$revision->getReviewers(),
	$revision->getCCPHIDs(),
	$revision->loadCommitPHIDs(),
	array(
	$revision->getAuthorPHID(),
	$user->getPHID(),
	),
	mpull($comments, 'getAuthorPHID'));

	foreach ($comments as $comment) {
	$metadata = $comment->getMetadata();
	$added_reviewers = idx(
	$metadata,
	DifferentialComment::METADATA_ADDED_REVIEWERS);
	if ($added_reviewers) {
	foreach ($added_reviewers as $phid) {
	$object_phids[] = $phid;
	}
	}
	$added_ccs = idx(
	$metadata,
	DifferentialComment::METADATA_ADDED_CCS);
	if ($added_ccs) {
	foreach ($added_ccs as $phid) {
	$object_phids[] = $phid;
	}
	}
	}

	foreach ($revision->getAttached() as $type => $phids) {
	foreach ($phids as $phid => $info) {
	$object_phids[] = $phid;
	}
	}

	$aux_phids = array();
	foreach ($aux_fields as $key => $aux_field) {
	$aux_field->setDiff($target);
	$aux_field->setManualDiff($target_manual);
	$aux_field->setDiffProperties($props);
	$aux_phids[$key] = $aux_field->getRequiredHandlePHIDsForRevisionView();
	}
	$object_phids = array_merge($object_phids, array_mergev($aux_phids));
	$object_phids = array_unique($object_phids);

	$handles = $this->loadViewerHandles($object_phids);

	foreach ($aux_fields as $key => $aux_field) {
	// Make sure each field only has access to handles it specifically
	// requested, not all handles. Otherwise you can get a field which works
	// only in the presence of other fields.
	$aux_field->setHandles(array_select_keys($handles, $aux_phids[$key]));
	}

	$reviewer_warning = null;
	if ($revision->getStatus() ==
	ArcanistDifferentialRevisionStatus::NEEDS_REVIEW) {
	$has_live_reviewer = false;
	foreach ($revision->getReviewers() as $reviewer) {
	if (!$handles[$reviewer]->isDisabled()) {
	$has_live_reviewer = true;
	break;
	}
	}
	if (!$has_live_reviewer) {
	$reviewer_warning = new AphrontErrorView();
	$reviewer_warning->setSeverity(AphrontErrorView::SEVERITY_WARNING);
	$reviewer_warning->setTitle(pht('No Active Reviewers'));
	if ($revision->getReviewers()) {
	$reviewer_warning->appendChild(
	phutil_tag(
	'p',
	array(),
	pht('All specified reviewers are disabled and this revision '.
	'needs review. You may want to add some new reviewers.')));
	} else {
	$reviewer_warning->appendChild(
	phutil_tag(
	'p',
	array(),
	pht('This revision has no specified reviewers and needs '.
	'review. You may want to add some reviewers.')));
	}
	}
	}

	$request_uri = $request->getRequestURI();

	$limit = 100;
	$large = $request->getStr('large');
	if (count($changesets) > $limit && !$large) {
	$count = count($changesets);
	$warning = new AphrontErrorView();
	$warning->setTitle('Very Large Diff');
	$warning->setSeverity(AphrontErrorView::SEVERITY_WARNING);
	$warning->appendChild(hsprintf(
	'%s <strong>%s</strong>',
	pht(
	'This diff is very large and affects %s files. Load each file '.
	'individually.',
	new PhutilNumber($count)),
	phutil_tag(
	'a',
	array(
	'href' => $request_uri
	->alter('large', 'true')
	->setFragment('toc'),
	),
	pht('Show All Files Inline'))));
	$warning = $warning->render();

	$my_inlines = id(new DifferentialInlineComment())->loadAllWhere(
	'revisionID = %d AND commentID IS NULL AND authorPHID = %s AND '.
	'changesetID IN (%Ld)',
	$this->revisionID,
	$user->getPHID(),
	mpull($changesets, 'getID'));

	$visible_changesets = array();
	foreach ($inlines + $my_inlines as $inline) {
	$changeset_id = $inline->getChangesetID();
	if (isset($changesets[$changeset_id])) {
	$visible_changesets[$changeset_id] = $changesets[$changeset_id];
	}
	}

	if (!empty($props['arc:lint'])) {
	$changeset_paths = mpull($changesets, null, 'getFilename');
	foreach ($props['arc:lint'] as $lint) {
	$changeset = idx($changeset_paths, $lint['path']);
	if ($changeset) {
	$visible_changesets[$changeset->getID()] = $changeset;
	}
	}
	}

	} else {
	$warning = null;
	$visible_changesets = $changesets;
	}

	$revision_detail = new DifferentialRevisionDetailView();
	$revision_detail->setRevision($revision);
	$revision_detail->setDiff(end($diffs));
	$revision_detail->setAuxiliaryFields($aux_fields);

	$actions = $this->getRevisionActions($revision);

	$custom_renderer_class = PhabricatorEnv::getEnvConfig(
	'differential.revision-custom-detail-renderer');
	if ($custom_renderer_class) {

	// TODO: build a better version of the action links and deprecate the
	// whole DifferentialRevisionDetailRenderer class.
	$custom_renderer = newv($custom_renderer_class, array());
	$custom_renderer->setUser($user);
	$custom_renderer->setDiff($target);
	if ($diff_vs) {
	$custom_renderer->setVSDiff($diffs[$diff_vs]);
	}
	$actions = array_merge(
	$actions,
	$custom_renderer->generateActionLinks($revision, $target_manual));
	}

	$whitespace = $request->getStr(
	'whitespace',
	DifferentialChangesetParser::WHITESPACE_IGNORE_ALL);

	if ($arc_project) {
	list($symbol_indexes, $project_phids) = $this->buildSymbolIndexes(
	$arc_project,
	$visible_changesets);
	} else {
	$symbol_indexes = array();
	$project_phids = null;
	}

	$revision_detail->setActions($actions);
	$revision_detail->setUser($user);

	$comment_view = new DifferentialRevisionCommentListView();
	$comment_view->setComments($comments);
	$comment_view->setHandles($handles);
	$comment_view->setInlineComments($inlines);
	$comment_view->setChangesets($all_changesets);
	$comment_view->setUser($user);
	$comment_view->setTargetDiff($target);
	$comment_view->setVersusDiffID($diff_vs);

	if ($arc_project) {
	Javelin::initBehavior(
	'repository-crossreference',
	array(
	'section' => $comment_view->getID(),
	'projects' => $project_phids,
	));
	}

	$changeset_view = new DifferentialChangesetListView();
	$changeset_view->setChangesets($changesets);
	$changeset_view->setVisibleChangesets($visible_changesets);

	if (!$viewer_is_anonymous) {
	$changeset_view->setInlineCommentControllerURI(
	'/differential/comment/inline/edit/'.$revision->getID().'/');
	}

	$changeset_view->setStandaloneURI('/differential/changeset/');
	$changeset_view->setRawFileURIs(
	'/differential/changeset/?view=old',
	'/differential/changeset/?view=new');

	$changeset_view->setUser($user);
	$changeset_view->setDiff($target);
	$changeset_view->setRenderingReferences($rendering_references);
	$changeset_view->setVsMap($vs_map);
	$changeset_view->setWhitespace($whitespace);
	if ($repository) {
	$changeset_view->setRepository($repository);
	}
	$changeset_view->setSymbolIndexes($symbol_indexes);
	$changeset_view->setTitle('Diff '.$target->getID());

	$diff_history = new DifferentialRevisionUpdateHistoryView();
	$diff_history->setDiffs($diffs);
	$diff_history->setSelectedVersusDiffID($diff_vs);
	$diff_history->setSelectedDiffID($target->getID());
	$diff_history->setSelectedWhitespace($whitespace);
	$diff_history->setUser($user);

	$local_view = new DifferentialLocalCommitsView();
	$local_view->setUser($user);
	$local_view->setLocalCommits(idx($props, 'local:commits'));

	if ($repository) {
	$other_revisions = $this->loadOtherRevisions(
	$changesets,
	$target,
	$repository);
	} else {
	$other_revisions = array();
	}

	$other_view = null;
	if ($other_revisions) {
	$other_view = $this->renderOtherRevisions($other_revisions);
	}

	$toc_view = new DifferentialDiffTableOfContentsView();
	$toc_view->setChangesets($changesets);
	$toc_view->setVisibleChangesets($visible_changesets);
	$toc_view->setRenderingReferences($rendering_references);
	$toc_view->setUnitTestData(idx($props, 'arc:unit', array()));
	if ($repository) {
	$toc_view->setRepository($repository);
	}
	$toc_view->setDiff($target);
	$toc_view->setUser($user);
	$toc_view->setRevisionID($revision->getID());
	$toc_view->setWhitespace($whitespace);

	$comment_form = null;
	if (!$viewer_is_anonymous) {
	$draft = id(new PhabricatorDraft())->loadOneWhere(
	'authorPHID = %s AND draftKey = %s',
	$user->getPHID(),
	'differential-comment-'.$revision->getID());

	$reviewers = array();
	$ccs = array();
	if ($draft) {
	$reviewers = idx($draft->getMetadata(), 'reviewers', array());
	$ccs = idx($draft->getMetadata(), 'ccs', array());
	if ($reviewers \|\| $ccs) {
	$handles = $this->loadViewerHandles(array_merge($reviewers, $ccs));
	$reviewers = array_select_keys($handles, $reviewers);
	$ccs = array_select_keys($handles, $ccs);
	}
	}

	$comment_form = new DifferentialAddCommentView();
	$comment_form->setRevision($revision);
	$comment_form->setAuxFields($aux_fields);
	$comment_form->setActions($this->getRevisionCommentActions($revision));
	$comment_form->setActionURI('/differential/comment/save/');
	$comment_form->setUser($user);
	$comment_form->setDraft($draft);
	$comment_form->setReviewers(mpull($reviewers, 'getFullName', 'getPHID'));
	$comment_form->setCCs(mpull($ccs, 'getFullName', 'getPHID'));
	}

	$pane_id = celerity_generate_unique_node_id();
	Javelin::initBehavior(
	'differential-keyboard-navigation',
	array(
	'haunt' => $pane_id,
	));
	Javelin::initBehavior('differential-user-select');

	$page_pane = id(new DifferentialPrimaryPaneView())
	->setID($pane_id)
	->appendChild(array(
	$comment_view->render(),
	$diff_history->render(),
	$warning,
	$local_view->render(),
	$toc_view->render(),
	$other_view,
	$changeset_view->render(),
	));
	if ($comment_form) {
	$page_pane->appendChild($comment_form->render());
	}

	PhabricatorFeedStoryNotification::updateObjectNotificationViews(
	$user, $revision->getPHID());

	$object_id = 'D'.$revision->getID();

	$top_anchor = id(new PhabricatorAnchorView())
	->setAnchorName('top')
	->setNavigationMarker(true);

	$content = array(
	$reviewer_warning,
	$top_anchor,
	$revision_detail,
	$page_pane,
	);

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addCrumb(
	id(new PhabricatorCrumbView())
	->setName($object_id)
	->setHref('/'.$object_id));

	$prefs = $user->loadPreferences();

	$pref_filetree = PhabricatorUserPreferences::PREFERENCE_DIFF_FILETREE;
	if ($prefs->getPreference($pref_filetree)) {
	$collapsed = $prefs->getPreference(
	PhabricatorUserPreferences::PREFERENCE_NAV_COLLAPSED,
	false);

	$nav = id(new DifferentialChangesetFileTreeSideNavBuilder())
	->setAnchorName('top')
	->setTitle('D'.$revision->getID())
	->setBaseURI(new PhutilURI('/D'.$revision->getID()))
	->setCollapsed((bool)$collapsed)
	->build($changesets);
	$nav->appendChild($content);
	$nav->setCrumbs($crumbs);
	$content = $nav;
	} else {
	array_unshift($content, $crumbs);
	}

	return $this->buildApplicationPage(
	$content,
	array(
	'title' => $object_id.' '.$revision->getTitle(),
	));
	}

	private function getImplicitComments(
	DifferentialRevision $revision,
	DifferentialDiff $diff) {

	$author_phid = nonempty(
	$diff->getAuthorPHID(),
	$revision->getAuthorPHID());

	$template = new DifferentialComment();
	$template->setAuthorPHID($author_phid);
	$template->setRevisionID($revision->getID());
	$template->setDateCreated($revision->getDateCreated());

	$comments = array();

	if (strlen($revision->getSummary())) {
	$summary_comment = clone $template;
	$summary_comment->setContent($revision->getSummary());
	$summary_comment->setAction(DifferentialAction::ACTION_SUMMARIZE);
	$comments[] = $summary_comment;
	}

	if (strlen($revision->getTestPlan())) {
	$testplan_comment = clone $template;
	$testplan_comment->setContent($revision->getTestPlan());
	$testplan_comment->setAction(DifferentialAction::ACTION_TESTPLAN);
	$comments[] = $testplan_comment;
	}

	return $comments;
	}

	private function getRevisionActions(DifferentialRevision $revision) {
	$user = $this->getRequest()->getUser();
	$viewer_phid = $user->getPHID();
	$viewer_is_owner = ($revision->getAuthorPHID() == $viewer_phid);
	$viewer_is_reviewer = in_array($viewer_phid, $revision->getReviewers());
	$viewer_is_cc = in_array($viewer_phid, $revision->getCCPHIDs());
	$viewer_is_anonymous = !$this->getRequest()->getUser()->isLoggedIn();
	$status = $revision->getStatus();
	$revision_id = $revision->getID();
	$revision_phid = $revision->getPHID();

	$links = array();

	if ($viewer_is_owner) {
	$links[] = array(
	'icon' => 'edit',
	'href' => "/differential/revision/edit/{$revision_id}/",
	'name' => pht('Edit Revision'),
	);
	}

	if (!$viewer_is_anonymous) {

	if (!$viewer_is_owner && !$viewer_is_reviewer) {
	$action = $viewer_is_cc ? 'rem' : 'add';
	$links[] = array(
	'icon' => $viewer_is_cc ? 'subscribe-delete' : 'subscribe-add',
	'href' => "/differential/subscribe/{$action}/{$revision_id}/",
	'name' => $viewer_is_cc ? pht('Unsubscribe') : pht('Subscribe'),
	'instant' => true,
	);
	} else {
	$links[] = array(
	'icon' => 'subscribe-auto',
	'name' => pht('Automatically Subscribed'),
	'disabled' => true,
	);
	}

	require_celerity_resource('phabricator-object-selector-css');
	require_celerity_resource('javelin-behavior-phabricator-object-selector');

	$links[] = array(
	'icon' => 'link',
	'name' => pht('Edit Dependencies'),
	'href' => "/search/attach/{$revision_phid}/DREV/dependencies/",
	'sigil' => 'workflow',
	);

	- if (PhabricatorEnv::getEnvConfig('maniphest.enabled')) {
	+ $maniphest = 'PhabricatorApplicationManiphest';
	+ if (PhabricatorApplication::isClassInstalled($maniphest)) {
	$links[] = array(
	'icon' => 'attach',
	'name' => pht('Edit Maniphest Tasks'),
	'href' => "/search/attach/{$revision_phid}/TASK/",
	'sigil' => 'workflow',
	);
	}
	}

	$request_uri = $this->getRequest()->getRequestURI();
	$links[] = array(
	'icon' => 'download',
	'name' => pht('Download Raw Diff'),
	'href' => $request_uri->alter('download', 'true')
	);

	return $links;
	}

	private function getRevisionCommentActions(DifferentialRevision $revision) {

	$actions = array(
	DifferentialAction::ACTION_COMMENT => true,
	);

	$viewer = $this->getRequest()->getUser();
	$viewer_phid = $viewer->getPHID();
	$viewer_is_owner = ($viewer_phid == $revision->getAuthorPHID());
	$viewer_is_reviewer = in_array($viewer_phid, $revision->getReviewers());
	$viewer_did_accept = ($viewer_phid === $revision->loadReviewedBy());
	$status = $revision->getStatus();

	$allow_self_accept = PhabricatorEnv::getEnvConfig(
	'differential.allow-self-accept');
	$always_allow_close = PhabricatorEnv::getEnvConfig(
	'differential.always-allow-close');
	$allow_reopen = PhabricatorEnv::getEnvConfig(
	'differential.allow-reopen');

	if ($viewer_is_owner) {
	switch ($status) {
	case ArcanistDifferentialRevisionStatus::NEEDS_REVIEW:
	$actions[DifferentialAction::ACTION_ACCEPT] = $allow_self_accept;
	$actions[DifferentialAction::ACTION_ABANDON] = true;
	$actions[DifferentialAction::ACTION_RETHINK] = true;
	break;
	case ArcanistDifferentialRevisionStatus::NEEDS_REVISION:
	$actions[DifferentialAction::ACTION_ACCEPT] = $allow_self_accept;
	$actions[DifferentialAction::ACTION_ABANDON] = true;
	$actions[DifferentialAction::ACTION_REQUEST] = true;
	break;
	case ArcanistDifferentialRevisionStatus::ACCEPTED:
	$actions[DifferentialAction::ACTION_ABANDON] = true;
	$actions[DifferentialAction::ACTION_REQUEST] = true;
	$actions[DifferentialAction::ACTION_RETHINK] = true;
	$actions[DifferentialAction::ACTION_CLOSE] = true;
	break;
	case ArcanistDifferentialRevisionStatus::CLOSED:
	break;
	case ArcanistDifferentialRevisionStatus::ABANDONED:
	$actions[DifferentialAction::ACTION_RECLAIM] = true;
	break;
	}
	} else {
	switch ($status) {
	case ArcanistDifferentialRevisionStatus::NEEDS_REVIEW:
	$actions[DifferentialAction::ACTION_ACCEPT] = true;
	$actions[DifferentialAction::ACTION_REJECT] = true;
	$actions[DifferentialAction::ACTION_RESIGN] = $viewer_is_reviewer;
	break;
	case ArcanistDifferentialRevisionStatus::NEEDS_REVISION:
	$actions[DifferentialAction::ACTION_ACCEPT] = true;
	$actions[DifferentialAction::ACTION_RESIGN] = $viewer_is_reviewer;
	break;
	case ArcanistDifferentialRevisionStatus::ACCEPTED:
	$actions[DifferentialAction::ACTION_REJECT] = true;
	$actions[DifferentialAction::ACTION_RESIGN] =
	$viewer_is_reviewer && !$viewer_did_accept;
	break;
	case ArcanistDifferentialRevisionStatus::CLOSED:
	case ArcanistDifferentialRevisionStatus::ABANDONED:
	break;
	}
	if ($status != ArcanistDifferentialRevisionStatus::CLOSED) {
	$actions[DifferentialAction::ACTION_CLAIM] = true;
	$actions[DifferentialAction::ACTION_CLOSE] = $always_allow_close;
	}
	}

	$actions[DifferentialAction::ACTION_ADDREVIEWERS] = true;
	$actions[DifferentialAction::ACTION_ADDCCS] = true;
	$actions[DifferentialAction::ACTION_REOPEN] = $allow_reopen &&
	($status == ArcanistDifferentialRevisionStatus::CLOSED);

	$actions = array_keys(array_filter($actions));
	$actions_dict = array();
	foreach ($actions as $action) {
	$actions_dict[$action] = DifferentialAction::getActionVerb($action);
	}

	return $actions_dict;
	}

	private function loadInlineComments(array $comments, array &$changesets) {
	assert_instances_of($comments, 'DifferentialComment');
	assert_instances_of($changesets, 'DifferentialChangeset');

	$inline_comments = array();

	$comment_ids = array_filter(mpull($comments, 'getID'));
	if (!$comment_ids) {
	return $inline_comments;
	}

	$inline_comments = id(new DifferentialInlineComment())
	->loadAllWhere(
	'commentID in (%Ld)',
	$comment_ids);

	$load_changesets = array();
	foreach ($inline_comments as $inline) {
	$changeset_id = $inline->getChangesetID();
	if (isset($changesets[$changeset_id])) {
	continue;
	}
	$load_changesets[$changeset_id] = true;
	}

	$more_changesets = array();
	if ($load_changesets) {
	$changeset_ids = array_keys($load_changesets);
	$more_changesets += id(new DifferentialChangeset())
	->loadAllWhere(
	'id IN (%Ld)',
	$changeset_ids);
	}

	if ($more_changesets) {
	$changesets += $more_changesets;
	$changesets = msort($changesets, 'getSortKey');
	}

	return $inline_comments;
	}

	private function loadChangesetsAndVsMap(
	DifferentialDiff $target,
	DifferentialDiff $diff_vs = null,
	PhabricatorRepository $repository = null) {

	$load_ids = array();
	if ($diff_vs) {
	$load_ids[] = $diff_vs->getID();
	}
	$load_ids[] = $target->getID();

	$raw_changesets = id(new DifferentialChangeset())
	->loadAllWhere(
	'diffID IN (%Ld)',
	$load_ids);
	$changeset_groups = mgroup($raw_changesets, 'getDiffID');

	$changesets = idx($changeset_groups, $target->getID(), array());
	$changesets = mpull($changesets, null, 'getID');

	$refs = array();
	$vs_map = array();
	$vs_changesets = array();
	if ($diff_vs) {
	$vs_id = $diff_vs->getID();
	$vs_changesets_path_map = array();
	foreach (idx($changeset_groups, $vs_id, array()) as $changeset) {
	$path = $changeset->getAbsoluteRepositoryPath($repository, $diff_vs);
	$vs_changesets_path_map[$path] = $changeset;
	$vs_changesets[$changeset->getID()] = $changeset;
	}
	foreach ($changesets as $key => $changeset) {
	$path = $changeset->getAbsoluteRepositoryPath($repository, $target);
	if (isset($vs_changesets_path_map[$path])) {
	$vs_map[$changeset->getID()] =
	$vs_changesets_path_map[$path]->getID();
	$refs[$changeset->getID()] =
	$changeset->getID().'/'.$vs_changesets_path_map[$path]->getID();
	unset($vs_changesets_path_map[$path]);
	} else {
	$refs[$changeset->getID()] = $changeset->getID();
	}
	}
	foreach ($vs_changesets_path_map as $path => $changeset) {
	$changesets[$changeset->getID()] = $changeset;
	$vs_map[$changeset->getID()] = -1;
	$refs[$changeset->getID()] = $changeset->getID().'/-1';
	}
	} else {
	foreach ($changesets as $changeset) {
	$refs[$changeset->getID()] = $changeset->getID();
	}
	}

	$changesets = msort($changesets, 'getSortKey');

	return array($changesets, $vs_map, $vs_changesets, $refs);
	}

	private function loadAuxiliaryFields(DifferentialRevision $revision) {

	$aux_fields = DifferentialFieldSelector::newSelector()
	->getFieldSpecifications();
	foreach ($aux_fields as $key => $aux_field) {
	if (!$aux_field->shouldAppearOnRevisionView()) {
	unset($aux_fields[$key]);
	} else {
	$aux_field->setUser($this->getRequest()->getUser());
	}
	}

	$aux_fields = DifferentialAuxiliaryField::loadFromStorage(
	$revision,
	$aux_fields);

	return $aux_fields;
	}

	private function buildSymbolIndexes(
	PhabricatorRepositoryArcanistProject $arc_project,
	array $visible_changesets) {
	assert_instances_of($visible_changesets, 'DifferentialChangeset');

	$engine = PhabricatorSyntaxHighlighter::newEngine();

	$langs = $arc_project->getSymbolIndexLanguages();
	if (!$langs) {
	return array(array(), array());
	}

	$symbol_indexes = array();

	$project_phids = array_merge(
	array($arc_project->getPHID()),
	nonempty($arc_project->getSymbolIndexProjects(), array()));

	$indexed_langs = array_fill_keys($langs, true);
	foreach ($visible_changesets as $key => $changeset) {
	$lang = $engine->getLanguageFromFilename($changeset->getFilename());
	if (isset($indexed_langs[$lang])) {
	$symbol_indexes[$key] = array(
	'lang' => $lang,
	'projects' => $project_phids,
	);
	}
	}

	return array($symbol_indexes, $project_phids);
	}

	private function loadOtherRevisions(
	array $changesets,
	DifferentialDiff $target,
	PhabricatorRepository $repository) {
	assert_instances_of($changesets, 'DifferentialChangeset');

	$paths = array();
	foreach ($changesets as $changeset) {
	$paths[] = $changeset->getAbsoluteRepositoryPath(
	$repository,
	$target);
	}

	if (!$paths) {
	return array();
	}

	$path_map = id(new DiffusionPathIDQuery($paths))->loadPathIDs();

	if (!$path_map) {
	return array();
	}

	$query = id(new DifferentialRevisionQuery())
	->withStatus(DifferentialRevisionQuery::STATUS_OPEN)
	->setOrder(DifferentialRevisionQuery::ORDER_PATH_MODIFIED)
	->setLimit(10)
	->needRelationships(true);

	foreach ($path_map as $path => $path_id) {
	$query->withPath($repository->getID(), $path_id);
	}

	$results = $query->execute();

	// Strip out this revision.
	foreach ($results as $key => $result) {
	if ($result->getID() == $this->revisionID) {
	unset($results[$key]);
	}
	}

	return $results;
	}

	private function renderOtherRevisions(array $revisions) {
	assert_instances_of($revisions, 'DifferentialRevision');

	$user = $this->getRequest()->getUser();

	$view = id(new DifferentialRevisionListView())
	->setRevisions($revisions)
	->setFields(DifferentialRevisionListView::getDefaultFields($user))
	->setUser($user)
	->loadAssets();

	$phids = $view->getRequiredHandlePHIDs();
	$handles = $this->loadViewerHandles($phids);
	$view->setHandles($handles);

	return hsprintf(
	'%s<div class="differential-panel">%s</div>',
	id(new PhabricatorHeaderView())
	->setHeader(pht('Open Revisions Affecting These Files'))
	->render(),
	$view->render());
	}

	/**
	* Straight copy of the loadFileByPhid method in
	* @{class:DifferentialReviewRequestMail}.
	*
	* This is because of the code similarity between the buildPatch method in
	* @{class:DifferentialReviewRequestMail} and @{method:buildRawDiffResponse}
	* in this class. Both of these methods end up using call_user_func and this
	* piece of code is the lucky function.
	*
	* @return mixed (@{class:PhabricatorFile} if found, null if not)
	*/
	public function loadFileByPHID($phid) {
	$file = id(new PhabricatorFile())->loadOneWhere(
	'phid = %s',
	$phid);
	if (!$file) {
	return null;
	}
	return $file->loadFileData();
	}

	/**
	* Note this code is somewhat similar to the buildPatch method in
	* @{class:DifferentialReviewRequestMail}.
	*
	* @return @{class:AphrontRedirectResponse}
	*/
	private function buildRawDiffResponse(
	array $changesets,
	array $vs_changesets,
	array $vs_map,
	PhabricatorRepository $repository = null) {

	assert_instances_of($changesets, 'DifferentialChangeset');
	assert_instances_of($vs_changesets, 'DifferentialChangeset');

	$engine = new PhabricatorDifferenceEngine();
	$generated_changesets = array();
	foreach ($changesets as $changeset) {
	$changeset->attachHunks($changeset->loadHunks());
	$right = $changeset->makeNewFile();
	$choice = $changeset;
	$vs = idx($vs_map, $changeset->getID());
	if ($vs == -1) {
	$left = $right;
	$right = $changeset->makeOldFile();
	} else if ($vs) {
	$choice = $vs_changeset = $vs_changesets[$vs];
	$vs_changeset->attachHunks($vs_changeset->loadHunks());
	$left = $vs_changeset->makeNewFile();
	} else {
	$left = $changeset->makeOldFile();
	}

	$synthetic = $engine->generateChangesetFromFileContent(
	$left,
	$right);

	if (!$synthetic->getAffectedLineCount()) {
	$filetype = $choice->getFileType();
	if ($filetype == DifferentialChangeType::FILE_TEXT \|\|
	$filetype == DifferentialChangeType::FILE_SYMLINK) {
	continue;
	}
	}

	$choice->attachHunks($synthetic->getHunks());

	$generated_changesets[] = $choice;
	}

	$diff = new DifferentialDiff();
	$diff->attachChangesets($generated_changesets);
	$diff_dict = $diff->getDiffDict();

	$changes = array();
	foreach ($diff_dict['changes'] as $changedict) {
	$changes[] = ArcanistDiffChange::newFromDictionary($changedict);
	}
	$bundle = ArcanistBundle::newFromChanges($changes);

	$bundle->setLoadFileDataCallback(array($this, 'loadFileByPHID'));

	$vcs = $repository ? $repository->getVersionControlSystem() : null;
	switch ($vcs) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
	case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
	$raw_diff = $bundle->toGitPatch();
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	default:
	$raw_diff = $bundle->toUnifiedDiff();
	break;
	}

	$request_uri = $this->getRequest()->getRequestURI();

	// this ends up being something like
	// D123.diff
	// or the verbose
	// D123.vs123.id123.whitespaceignore-all.diff
	// lame but nice to include these options
	$file_name = ltrim($request_uri->getPath(), '/').'.';
	foreach ($request_uri->getQueryParams() as $key => $value) {
	if ($key == 'download') {
	continue;
	}
	$file_name .= $key.$value.'.';
	}
	$file_name .= 'diff';

	$file = PhabricatorFile::buildFromFileDataOrHash(
	$raw_diff,
	array(
	'name' => $file_name,
	));

	return id(new AphrontRedirectResponse())->setURI($file->getBestURI());

	}
	}
	diff --git a/src/applications/differential/field/specification/DifferentialFreeformFieldSpecification.php b/src/applications/differential/field/specification/DifferentialFreeformFieldSpecification.php
	index 2bd242c24a..5e663c5bef 100644
	--- a/src/applications/differential/field/specification/DifferentialFreeformFieldSpecification.php
	+++ b/src/applications/differential/field/specification/DifferentialFreeformFieldSpecification.php
	@@ -1,206 +1,207 @@
	<?php

	abstract class DifferentialFreeformFieldSpecification
	extends DifferentialFieldSpecification {

	private function findMentionedTasks($message) {
	- if (!PhabricatorEnv::getEnvConfig('maniphest.enabled')) {
	+ $maniphest = 'PhabricatorApplicationManiphest';
	+ if (!PhabricatorApplication::isClassInstalled($maniphest)) {
	return array();
	}

	$prefixes = array(
	'resolve' => ManiphestTaskStatus::STATUS_CLOSED_RESOLVED,
	'resolves' => ManiphestTaskStatus::STATUS_CLOSED_RESOLVED,
	'resolved' => ManiphestTaskStatus::STATUS_CLOSED_RESOLVED,
	'fix' => ManiphestTaskStatus::STATUS_CLOSED_RESOLVED,
	'fixes' => ManiphestTaskStatus::STATUS_CLOSED_RESOLVED,
	'fixed' => ManiphestTaskStatus::STATUS_CLOSED_RESOLVED,
	'wontfix' => ManiphestTaskStatus::STATUS_CLOSED_WONTFIX,
	'wontfixes' => ManiphestTaskStatus::STATUS_CLOSED_WONTFIX,
	'wontfixed' => ManiphestTaskStatus::STATUS_CLOSED_WONTFIX,
	'spite' => ManiphestTaskStatus::STATUS_CLOSED_SPITE,
	'spites' => ManiphestTaskStatus::STATUS_CLOSED_SPITE,
	'spited' => ManiphestTaskStatus::STATUS_CLOSED_SPITE,
	'invalidate' => ManiphestTaskStatus::STATUS_CLOSED_INVALID,
	'invaldiates' => ManiphestTaskStatus::STATUS_CLOSED_INVALID,
	'invalidated' => ManiphestTaskStatus::STATUS_CLOSED_INVALID,
	'close' => ManiphestTaskStatus::STATUS_CLOSED_RESOLVED,
	'closes' => ManiphestTaskStatus::STATUS_CLOSED_RESOLVED,
	'closed' => ManiphestTaskStatus::STATUS_CLOSED_RESOLVED,
	'ref' => null,
	'refs' => null,
	'references' => null,
	'cf.' => null,
	);

	$suffixes = array(
	'as resolved' => ManiphestTaskStatus::STATUS_CLOSED_RESOLVED,
	'as fixed' => ManiphestTaskStatus::STATUS_CLOSED_RESOLVED,
	'as wontfix' => ManiphestTaskStatus::STATUS_CLOSED_WONTFIX,
	'as spite' => ManiphestTaskStatus::STATUS_CLOSED_SPITE,
	'out of spite' => ManiphestTaskStatus::STATUS_CLOSED_SPITE,
	'as invalid' => ManiphestTaskStatus::STATUS_CLOSED_INVALID,
	'' => null,
	);

	$prefix_regex = array();
	foreach ($prefixes as $prefix => $resolution) {
	$prefix_regex[] = preg_quote($prefix, '/');
	}
	$prefix_regex = implode('\|', $prefix_regex);

	$suffix_regex = array();
	foreach ($suffixes as $suffix => $resolution) {
	$suffix_regex[] = preg_quote($suffix, '/');
	}
	$suffix_regex = implode('\|', $suffix_regex);

	$matches = null;
	preg_match_all(
	"/({$prefix_regex})\s+T(\d+)\s*({$suffix_regex})/i",
	$message,
	$matches,
	PREG_SET_ORDER);

	$tasks_statuses = array();
	foreach ($matches as $set) {
	$prefix = strtolower($set[1]);
	$task_id = (int)$set[2];
	$suffix = strtolower($set[3]);

	$status = idx($suffixes, $suffix);
	if (!$status) {
	$status = idx($prefixes, $prefix);
	}

	$tasks_statuses[$task_id] = $status;
	}

	return $tasks_statuses;
	}

	private function findDependentRevisions($message) {
	$dependents = array();

	$matches = null;
	preg_match_all(
	'/\b(?i:depends\s+on)\s+D(\d+(,\s+D\d++)*)\b/',
	$message,
	$matches);

	foreach ($matches[1] as $revisions) {
	foreach (preg_split('/,\s+D/', $revisions) as $id) {
	$dependents[$id] = $id;
	}
	}

	return $dependents;
	}

	public function didWriteRevision(DifferentialRevisionEditor $editor) {
	$message = $this->renderValueForCommitMessage(false);

	$tasks = $this->findMentionedTasks($message);
	if ($tasks) {
	$tasks = id(new ManiphestTask())
	->loadAllWhere('id IN (%Ld)', array_keys($tasks));
	$this->saveFieldEdges(
	$editor->getRevision(),
	PhabricatorEdgeConfig::TYPE_DREV_HAS_RELATED_TASK,
	mpull($tasks, 'getPHID'));
	}

	$dependents = $this->findDependentRevisions($message);
	if ($dependents) {
	$dependents = id(new DifferentialRevision())
	->loadAllWhere('id IN (%Ld)', $dependents);
	$this->saveFieldEdges(
	$editor->getRevision(),
	PhabricatorEdgeConfig::TYPE_DREV_DEPENDS_ON_DREV,
	mpull($dependents, 'getPHID'));
	}
	}

	private function saveFieldEdges(
	DifferentialRevision $revision,
	$edge_type,
	array $add_phids) {

	$revision_phid = $revision->getPHID();

	$old_phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
	$revision_phid,
	$edge_type);

	$add_phids = array_diff($add_phids, $old_phids);
	if (!$add_phids) {
	return;
	}

	$edge_editor = id(new PhabricatorEdgeEditor())->setActor($this->getUser());
	foreach ($add_phids as $phid) {
	$edge_editor->addEdge($revision_phid, $edge_type, $phid);
	}
	// NOTE: Deletes only through the fields.
	$edge_editor->save();
	}

	public function didParseCommit(
	PhabricatorRepository $repository,
	PhabricatorRepositoryCommit $commit,
	PhabricatorRepositoryCommitData $data) {

	$user = id(new PhabricatorUser())->loadOneWhere(
	'phid = %s',
	$data->getCommitDetail('authorPHID'));
	if (!$user) {
	return;
	}

	$message = $this->renderValueForCommitMessage($is_edit = false);
	$tasks_statuses = $this->findMentionedTasks($message);
	if (!$tasks_statuses) {
	return;
	}

	$tasks = id(new ManiphestTaskQuery())
	->withTaskIDs(array_keys($tasks_statuses))
	->execute();

	foreach ($tasks as $task_id => $task) {
	id(new PhabricatorEdgeEditor())
	->setActor($user)
	->addEdge(
	$task->getPHID(),
	PhabricatorEdgeConfig::TYPE_TASK_HAS_COMMIT,
	$commit->getPHID())
	->save();

	$status = $tasks_statuses[$task_id];
	if (!$status) {
	// Text like "Ref T123", don't change the task status.
	continue;
	}

	if ($task->getStatus() != ManiphestTaskStatus::STATUS_OPEN) {
	// Task is already closed.
	continue;
	}

	$commit_name = $repository->formatCommitName(
	$commit->getCommitIdentifier());

	$call = new ConduitCall(
	'maniphest.update',
	array(
	'id' => $task->getID(),
	'status' => $status,
	'comments' => "Closed by commit {$commit_name}.",
	));

	$call->setUser($user);
	$call->execute();
	}
	}

	}
	diff --git a/src/applications/differential/field/specification/DifferentialManiphestTasksFieldSpecification.php b/src/applications/differential/field/specification/DifferentialManiphestTasksFieldSpecification.php
	index cfcea7208a..88f24334be 100644
	--- a/src/applications/differential/field/specification/DifferentialManiphestTasksFieldSpecification.php
	+++ b/src/applications/differential/field/specification/DifferentialManiphestTasksFieldSpecification.php
	@@ -1,183 +1,184 @@
	<?php

	final class DifferentialManiphestTasksFieldSpecification
	extends DifferentialFieldSpecification {

	private $oldManiphestTasks = array();
	private $maniphestTasks = array();

	public function shouldAppearOnRevisionView() {
	- return PhabricatorEnv::getEnvConfig('maniphest.enabled');
	+ return PhabricatorApplication::isClassInstalled(
	+ 'PhabricatorApplicationManiphest');
	}

	public function getRequiredHandlePHIDsForRevisionView() {
	return $this->getManiphestTaskPHIDs();
	}

	public function renderLabelForRevisionView() {
	return 'Maniphest Tasks:';
	}

	public function renderValueForRevisionView() {
	$task_phids = $this->getManiphestTaskPHIDs();
	if (!$task_phids) {
	return null;
	}

	$links = array();
	foreach ($task_phids as $task_phid) {
	$links[] = $this->getHandle($task_phid)->renderLink();
	}

	return phutil_implode_html(phutil_tag('br'), $links);
	}

	private function getManiphestTaskPHIDs() {
	$revision = $this->getRevision();
	if (!$revision->getPHID()) {
	return array();
	}
	return PhabricatorEdgeQuery::loadDestinationPHIDs(
	$revision->getPHID(),
	PhabricatorEdgeConfig::TYPE_DREV_HAS_RELATED_TASK);
	}

	/**
	* Attach the revision to the task(s) and the task(s) to the revision.
	*
	* @return void
	*/
	public function didWriteRevision(DifferentialRevisionEditor $editor) {
	$revision = $editor->getRevision();
	$revision_phid = $revision->getPHID();
	$edge_type = PhabricatorEdgeConfig::TYPE_DREV_HAS_RELATED_TASK;

	$old_phids = $this->oldManiphestTasks;
	$add_phids = $this->maniphestTasks;
	$rem_phids = array_diff($old_phids, $add_phids);

	$edge_editor = id(new PhabricatorEdgeEditor())
	->setActor($this->getUser());

	foreach ($add_phids as $phid) {
	$edge_editor->addEdge($revision_phid, $edge_type, $phid);
	}

	foreach ($rem_phids as $phid) {
	$edge_editor->removeEdge($revision_phid, $edge_type, $phid);
	}

	$edge_editor->save();
	}

	protected function didSetRevision() {
	$this->maniphestTasks = $this->getManiphestTaskPHIDs();
	$this->oldManiphestTasks = $this->maniphestTasks;
	}

	public function getRequiredHandlePHIDsForCommitMessage() {
	return $this->maniphestTasks;
	}

	public function shouldAppearOnCommitMessageTemplate() {
	return false;
	}

	public function shouldAppearOnCommitMessage() {
	- return PhabricatorEnv::getEnvConfig('maniphest.enabled');
	+ return $this->shouldAppearOnRevisionView();
	}

	public function getCommitMessageKey() {
	return 'maniphestTaskPHIDs';
	}

	public function setValueFromParsedCommitMessage($value) {
	$this->maniphestTasks = array_unique(nonempty($value, array()));
	return $this;
	}

	public function renderLabelForCommitMessage() {
	return 'Maniphest Tasks';
	}

	public function getSupportedCommitMessageLabels() {
	return array(
	'Maniphest Task',
	'Maniphest Tasks',
	);
	}

	public function renderValueForCommitMessage($is_edit) {
	if (!$this->maniphestTasks) {
	return null;
	}

	$names = array();
	foreach ($this->maniphestTasks as $phid) {
	$handle = $this->getHandle($phid);
	$names[] = $handle->getName();
	}
	return implode(', ', $names);
	}

	public function parseValueFromCommitMessage($value) {
	$matches = null;
	preg_match_all('/T(\d+)/', $value, $matches);
	if (empty($matches[0])) {
	return array();
	}


	$task_ids = $matches[1];
	$tasks = id(new ManiphestTask())
	->loadAllWhere('id in (%Ld)', $task_ids);

	$task_phids = array();
	$invalid = array();
	foreach ($task_ids as $task_id) {
	$task = idx($tasks, $task_id);
	if (empty($task)) {
	$invalid[] = 'T'.$task_id;
	} else {
	$task_phids[] = $task->getPHID();
	}
	}

	if ($invalid) {
	$what = pht('Maniphest Task(s)', count($invalid));
	$invalid = implode(', ', $invalid);
	throw new DifferentialFieldParseException(
	"Commit message references nonexistent {$what}: {$invalid}.");
	}

	return $task_phids;
	}

	public function renderValueForMail($phase) {
	if ($phase == DifferentialMailPhase::COMMENT) {
	return null;
	}

	if (!$this->maniphestTasks) {
	return null;
	}

	$handles = id(new PhabricatorObjectHandleData($this->maniphestTasks))
	->setViewer($this->getUser())
	->loadHandles();
	$body = array();
	$body[] = 'MANIPHEST TASKS';
	foreach ($handles as $handle) {
	$body[] = ' '.PhabricatorEnv::getProductionURI($handle->getURI());
	}
	return implode("\n", $body);
	}

	public function getCommitMessageTips() {
	return array(
	'Use "Fixes T123" in your summary to mark that the current '.
	'revision completes a given task.'
	);
	}

	}
	diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php
	index ef1ada2f3e..9b5d4da7b8 100644
	--- a/src/applications/diffusion/controller/DiffusionCommitController.php
	+++ b/src/applications/diffusion/controller/DiffusionCommitController.php
	@@ -1,945 +1,946 @@
	<?php

	final class DiffusionCommitController extends DiffusionController {

	const CHANGES_LIMIT = 100;

	private $auditAuthorityPHIDs;
	private $highlightedAudits;

	public function willProcessRequest(array $data) {
	// This controller doesn't use blob/path stuff, just pass the dictionary
	// in directly instead of using the AphrontRequest parsing mechanism.
	$drequest = DiffusionRequest::newFromDictionary($data);
	$this->diffusionRequest = $drequest;
	}

	public function processRequest() {
	$drequest = $this->getDiffusionRequest();
	$request = $this->getRequest();
	$user = $request->getUser();

	if ($request->getStr('diff')) {
	return $this->buildRawDiffResponse($drequest);
	}

	$callsign = $drequest->getRepository()->getCallsign();

	$content = array();
	$repository = $drequest->getRepository();
	$commit = $drequest->loadCommit();

	if (!$commit) {
	$query = DiffusionExistsQuery::newFromDiffusionRequest($drequest);
	$exists = $query->loadExistentialData();
	if (!$exists) {
	return new Aphront404Response();
	}
	return $this->buildStandardPageResponse(
	id(new AphrontErrorView())
	->setTitle('Error displaying commit.')
	->appendChild('Failed to load the commit because the commit has not '.
	'been parsed yet.'),
	array('title' => 'Commit Still Parsing'));
	}

	$commit_data = $drequest->loadCommitData();
	$commit->attachCommitData($commit_data);

	$top_anchor = id(new PhabricatorAnchorView())
	->setAnchorName('top')
	->setNavigationMarker(true);

	$is_foreign = $commit_data->getCommitDetail('foreign-svn-stub');
	$changesets = null;
	if ($is_foreign) {
	$subpath = $commit_data->getCommitDetail('svn-subpath');

	$error_panel = new AphrontErrorView();
	$error_panel->setTitle('Commit Not Tracked');
	$error_panel->setSeverity(AphrontErrorView::SEVERITY_WARNING);
	$error_panel->appendChild(
	"This Diffusion repository is configured to track only one ".
	"subdirectory of the entire Subversion repository, and this commit ".
	"didn't affect the tracked subdirectory ('".$subpath."'), so no ".
	"information is available.");
	$content[] = $error_panel;
	$content[] = $top_anchor;
	} else {
	$engine = PhabricatorMarkupEngine::newDifferentialMarkupEngine();
	$engine->setConfig('viewer', $user);

	require_celerity_resource('diffusion-commit-view-css');
	require_celerity_resource('phabricator-remarkup-css');

	$parent_query = DiffusionCommitParentsQuery::newFromDiffusionRequest(
	$drequest);

	$headsup_view = id(new PhabricatorHeaderView())
	->setHeader(nonempty($commit->getSummary(), pht('Commit Detail')));

	$headsup_actions = $this->renderHeadsupActionList($commit, $repository);

	$commit_properties = $this->loadCommitProperties(
	$commit,
	$commit_data,
	$parent_query->loadParents());
	$property_list = id(new PhabricatorPropertyListView())
	->setHasKeyboardShortcuts(true);
	foreach ($commit_properties as $key => $value) {
	$property_list->addProperty($key, $value);
	}

	$property_list->addTextContent(
	phutil_tag(
	'div',
	array(
	'class' => 'diffusion-commit-message phabricator-remarkup',
	),
	$engine->markupText($commit_data->getCommitMessage())));

	$content[] = $top_anchor;
	$content[] = $headsup_view;
	$content[] = $headsup_actions;
	$content[] = $property_list;
	}

	$query = new PhabricatorAuditQuery();
	$query->withCommitPHIDs(array($commit->getPHID()));
	$audit_requests = $query->execute();

	$this->auditAuthorityPHIDs =
	PhabricatorAuditCommentEditor::loadAuditPHIDsForUser($user);

	$content[] = $this->buildAuditTable($commit, $audit_requests);
	$content[] = $this->buildComments($commit);

	$hard_limit = 1000;

	$change_query = DiffusionPathChangeQuery::newFromDiffusionRequest(
	$drequest);
	$change_query->setLimit($hard_limit + 1);
	$changes = $change_query->loadChanges();

	$was_limited = (count($changes) > $hard_limit);
	if ($was_limited) {
	$changes = array_slice($changes, 0, $hard_limit);
	}

	$content[] = $this->buildMergesTable($commit);

	$owners_paths = array();
	if ($this->highlightedAudits) {
	$packages = id(new PhabricatorOwnersPackage())->loadAllWhere(
	'phid IN (%Ls)',
	mpull($this->highlightedAudits, 'getAuditorPHID'));
	if ($packages) {
	$owners_paths = id(new PhabricatorOwnersPath())->loadAllWhere(
	'repositoryPHID = %s AND packageID IN (%Ld)',
	$repository->getPHID(),
	mpull($packages, 'getID'));
	}
	}

	$change_table = new DiffusionCommitChangeTableView();
	$change_table->setDiffusionRequest($drequest);
	$change_table->setPathChanges($changes);
	$change_table->setOwnersPaths($owners_paths);

	$count = count($changes);

	$bad_commit = null;
	if ($count == 0) {
	$bad_commit = queryfx_one(
	id(new PhabricatorRepository())->establishConnection('r'),
	'SELECT * FROM %T WHERE fullCommitName = %s',
	PhabricatorRepository::TABLE_BADCOMMIT,
	'r'.$callsign.$commit->getCommitIdentifier());
	}

	if ($bad_commit) {
	$error_panel = new AphrontErrorView();
	$error_panel->setTitle('Bad Commit');
	$error_panel->appendChild($bad_commit['description']);

	$content[] = $error_panel;
	} else if ($is_foreign) {
	// Don't render anything else.
	} else if (!count($changes)) {
	$no_changes = new AphrontErrorView();
	$no_changes->setSeverity(AphrontErrorView::SEVERITY_WARNING);
	$no_changes->setTitle('Not Yet Parsed');
	// TODO: This can also happen with weird SVN changes that don't do
	// anything (or only alter properties?), although the real no-changes case
	// is extremely rare and might be impossible to produce organically. We
	// should probably write some kind of "Nothing Happened!" change into the
	// DB once we parse these changes so we can distinguish between
	// "not parsed yet" and "no changes".
	$no_changes->appendChild(
	"This commit hasn't been fully parsed yet (or doesn't affect any ".
	"paths).");
	$content[] = $no_changes;
	} else if ($was_limited) {
	$huge_commit = new AphrontErrorView();
	$huge_commit->setSeverity(AphrontErrorView::SEVERITY_WARNING);
	$huge_commit->setTitle(pht('Enormous Commit'));
	$huge_commit->appendChild(
	pht(
	'This commit is enormous, and affects more than %d files. '.
	'Changes are not shown.',
	$hard_limit));
	$content[] = $huge_commit;
	} else {
	$change_panel = new AphrontPanelView();
	$change_panel->setHeader("Changes (".number_format($count).")");
	$change_panel->setID('toc');
	if ($count > self::CHANGES_LIMIT) {
	$show_all_button = phutil_tag(
	'a',
	array(
	'class' => 'button green',
	'href' => '?show_all=true',
	),
	'Show All Changes');
	$warning_view = id(new AphrontErrorView())
	->setSeverity(AphrontErrorView::SEVERITY_WARNING)
	->setTitle('Very Large Commit')
	->appendChild(phutil_tag(
	'p',
	array(),
	"This commit is very large. Load each file individually."));

	$change_panel->appendChild($warning_view);
	$change_panel->addButton($show_all_button);
	}

	$change_panel->appendChild($change_table);
	$change_panel->setNoBackground();

	$content[] = $change_panel;

	$changesets = DiffusionPathChange::convertToDifferentialChangesets(
	$changes);

	$vcs = $repository->getVersionControlSystem();
	switch ($vcs) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	$vcs_supports_directory_changes = true;
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
	case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
	$vcs_supports_directory_changes = false;
	break;
	default:
	throw new Exception("Unknown VCS.");
	}

	$references = array();
	foreach ($changesets as $key => $changeset) {
	$file_type = $changeset->getFileType();
	if ($file_type == DifferentialChangeType::FILE_DIRECTORY) {
	if (!$vcs_supports_directory_changes) {
	unset($changesets[$key]);
	continue;
	}
	}

	$references[$key] = $drequest->generateURI(
	array(
	'action' => 'rendering-ref',
	'path' => $changeset->getFilename(),
	));
	}

	// TODO: Some parts of the views still rely on properties of the
	// DifferentialChangeset. Make the objects ephemeral to make sure we don't
	// accidentally save them, and then set their ID to the appropriate ID for
	// this application (the path IDs).
	$path_ids = array_flip(mpull($changes, 'getPath'));
	foreach ($changesets as $changeset) {
	$changeset->makeEphemeral();
	$changeset->setID($path_ids[$changeset->getFilename()]);
	}

	if ($count <= self::CHANGES_LIMIT) {
	$visible_changesets = $changesets;
	} else {
	$visible_changesets = array();
	$inlines = id(new PhabricatorAuditInlineComment())->loadAllWhere(
	'commitPHID = %s AND (auditCommentID IS NOT NULL OR authorPHID = %s)',
	$commit->getPHID(),
	$user->getPHID());
	$path_ids = mpull($inlines, null, 'getPathID');
	foreach ($changesets as $key => $changeset) {
	if (array_key_exists($changeset->getID(), $path_ids)) {
	$visible_changesets[$key] = $changeset;
	}
	}
	}

	$change_list_title = DiffusionView::nameCommit(
	$repository,
	$commit->getCommitIdentifier());
	$change_list = new DifferentialChangesetListView();
	$change_list->setTitle($change_list_title);
	$change_list->setChangesets($changesets);
	$change_list->setVisibleChangesets($visible_changesets);
	$change_list->setRenderingReferences($references);
	$change_list->setRenderURI('/diffusion/'.$callsign.'/diff/');
	$change_list->setRepository($repository);
	$change_list->setUser($user);
	// pick the first branch for "Browse in Diffusion" View Option
	$branches = $commit_data->getCommitDetail('seenOnBranches', array());
	$first_branch = reset($branches);
	$change_list->setBranch($first_branch);

	$change_list->setStandaloneURI(
	'/diffusion/'.$callsign.'/diff/');
	$change_list->setRawFileURIs(
	// TODO: Implement this, somewhat tricky if there's an octopus merge
	// or whatever?
	null,
	'/diffusion/'.$callsign.'/diff/?view=r');

	$change_list->setInlineCommentControllerURI(
	'/diffusion/inline/edit/'.phutil_escape_uri($commit->getPHID()).'/');

	$change_references = array();
	foreach ($changesets as $key => $changeset) {
	$change_references[$changeset->getID()] = $references[$key];
	}
	$change_table->setRenderingReferences($change_references);

	$content[] = $change_list->render();
	}

	$content[] = $this->renderAddCommentPanel($commit, $audit_requests);

	$commit_id = 'r'.$callsign.$commit->getCommitIdentifier();
	$short_name = DiffusionView::nameCommit(
	$repository,
	$commit->getCommitIdentifier());

	$crumbs = $this->buildCrumbs(array(
	'commit' => true,
	));

	$prefs = $user->loadPreferences();
	$pref_filetree = PhabricatorUserPreferences::PREFERENCE_DIFF_FILETREE;
	$pref_collapse = PhabricatorUserPreferences::PREFERENCE_NAV_COLLAPSED;
	$show_filetree = $prefs->getPreference($pref_filetree);
	$collapsed = $prefs->getPreference($pref_collapse);

	if ($changesets && $show_filetree) {
	$nav = id(new DifferentialChangesetFileTreeSideNavBuilder())
	->setAnchorName('top')
	->setTitle($short_name)
	->setBaseURI(new PhutilURI('/'.$commit_id))
	->build($changesets)
	->setCrumbs($crumbs)
	->setCollapsed((bool)$collapsed)
	->appendChild($content);
	$content = $nav;
	} else {
	$content = array($crumbs, $content);
	}

	return $this->buildApplicationPage(
	$content,
	array(
	'title' => $commit_id
	));
	}

	private function loadCommitProperties(
	PhabricatorRepositoryCommit $commit,
	PhabricatorRepositoryCommitData $data,
	array $parents) {

	assert_instances_of($parents, 'PhabricatorRepositoryCommit');
	$user = $this->getRequest()->getUser();
	$commit_phid = $commit->getPHID();

	$edges = id(new PhabricatorEdgeQuery())
	->withSourcePHIDs(array($commit_phid))
	->withEdgeTypes(array(
	PhabricatorEdgeConfig::TYPE_COMMIT_HAS_TASK,
	PhabricatorEdgeConfig::TYPE_COMMIT_HAS_PROJECT
	))
	->execute();

	$task_phids = array_keys(
	$edges[$commit_phid][PhabricatorEdgeConfig::TYPE_COMMIT_HAS_TASK]);
	$proj_phids = array_keys(
	$edges[$commit_phid][PhabricatorEdgeConfig::TYPE_COMMIT_HAS_PROJECT]);

	$phids = array_merge($task_phids, $proj_phids);
	if ($data->getCommitDetail('authorPHID')) {
	$phids[] = $data->getCommitDetail('authorPHID');
	}
	if ($data->getCommitDetail('reviewerPHID')) {
	$phids[] = $data->getCommitDetail('reviewerPHID');
	}
	if ($data->getCommitDetail('committerPHID')) {
	$phids[] = $data->getCommitDetail('committerPHID');
	}
	if ($data->getCommitDetail('differential.revisionPHID')) {
	$phids[] = $data->getCommitDetail('differential.revisionPHID');
	}
	if ($parents) {
	foreach ($parents as $parent) {
	$phids[] = $parent->getPHID();
	}
	}

	$handles = array();
	if ($phids) {
	$handles = $this->loadViewerHandles($phids);
	}

	$props = array();

	if ($commit->getAuditStatus()) {
	$status = PhabricatorAuditCommitStatusConstants::getStatusName(
	$commit->getAuditStatus());
	$props['Status'] = phutil_tag(
	'strong',
	array(),
	$status);
	}

	$props['Committed'] = phabricator_datetime($commit->getEpoch(), $user);

	$author_phid = $data->getCommitDetail('authorPHID');
	if ($data->getCommitDetail('authorPHID')) {
	$props['Author'] = $handles[$author_phid]->renderLink();
	} else {
	$props['Author'] = $data->getAuthorName();
	}

	$reviewer_phid = $data->getCommitDetail('reviewerPHID');
	if ($reviewer_phid) {
	$props['Reviewer'] = $handles[$reviewer_phid]->renderLink();
	}

	$committer = $data->getCommitDetail('committer');
	if ($committer) {
	$committer_phid = $data->getCommitDetail('committerPHID');
	if ($data->getCommitDetail('committerPHID')) {
	$props['Committer'] = $handles[$committer_phid]->renderLink();
	} else {
	$props['Committer'] = $committer;
	}
	}

	$revision_phid = $data->getCommitDetail('differential.revisionPHID');
	if ($revision_phid) {
	$props['Differential Revision'] = $handles[$revision_phid]->renderLink();
	}

	if ($parents) {
	$parent_links = array();
	foreach ($parents as $parent) {
	$parent_links[] = $handles[$parent->getPHID()]->renderLink();
	}
	$props['Parents'] = phutil_implode_html(" \xC2\xB7 ", $parent_links);
	}

	$request = $this->getDiffusionRequest();

	$props['Branches'] = phutil_tag(
	'span',
	array(
	'id' => 'commit-branches',
	),
	'Unknown');
	$props['Tags'] = phutil_tag(
	'span',
	array(
	'id' => 'commit-tags',
	),
	'Unknown');

	$callsign = $request->getRepository()->getCallsign();
	$root = '/diffusion/'.$callsign.'/commit/'.$commit->getCommitIdentifier();
	Javelin::initBehavior(
	'diffusion-commit-branches',
	array(
	$root.'/branches/' => 'commit-branches',
	$root.'/tags/' => 'commit-tags',
	));

	$refs = $this->buildRefs($request);
	if ($refs) {
	$props['References'] = $refs;
	}

	if ($task_phids) {
	$task_list = array();
	foreach ($task_phids as $phid) {
	$task_list[] = $handles[$phid]->renderLink();
	}
	$task_list = phutil_implode_html(phutil_tag('br'), $task_list);
	$props['Tasks'] = $task_list;
	}

	if ($proj_phids) {
	$proj_list = array();
	foreach ($proj_phids as $phid) {
	$proj_list[] = $handles[$phid]->renderLink();
	}
	$proj_list = phutil_implode_html(phutil_tag('br'), $proj_list);
	$props['Projects'] = $proj_list;
	}

	return $props;
	}

	private function buildAuditTable(
	PhabricatorRepositoryCommit $commit,
	array $audits) {
	assert_instances_of($audits, 'PhabricatorRepositoryAuditRequest');
	$user = $this->getRequest()->getUser();

	$view = new PhabricatorAuditListView();
	$view->setAudits($audits);
	$view->setCommits(array($commit));
	$view->setUser($user);
	$view->setShowCommits(false);

	$phids = $view->getRequiredHandlePHIDs();
	$handles = $this->loadViewerHandles($phids);
	$view->setHandles($handles);
	$view->setAuthorityPHIDs($this->auditAuthorityPHIDs);
	$this->highlightedAudits = $view->getHighlightedAudits();

	$panel = new AphrontPanelView();
	$panel->setHeader('Audits');
	$panel->setCaption('Audits you are responsible for are highlighted.');
	$panel->appendChild($view);
	$panel->setNoBackground();

	return $panel;
	}

	private function buildComments(PhabricatorRepositoryCommit $commit) {
	$user = $this->getRequest()->getUser();
	$comments = id(new PhabricatorAuditComment())->loadAllWhere(
	'targetPHID = %s ORDER BY dateCreated ASC',
	$commit->getPHID());

	$inlines = id(new PhabricatorAuditInlineComment())->loadAllWhere(
	'commitPHID = %s AND auditCommentID IS NOT NULL',
	$commit->getPHID());

	$path_ids = mpull($inlines, 'getPathID');

	$path_map = array();
	if ($path_ids) {
	$path_map = id(new DiffusionPathQuery())
	->withPathIDs($path_ids)
	->execute();
	$path_map = ipull($path_map, 'path', 'id');
	}

	$engine = new PhabricatorMarkupEngine();
	$engine->setViewer($user);

	foreach ($comments as $comment) {
	$engine->addObject(
	$comment,
	PhabricatorAuditComment::MARKUP_FIELD_BODY);
	}

	foreach ($inlines as $inline) {
	$engine->addObject(
	$inline,
	PhabricatorInlineCommentInterface::MARKUP_FIELD_BODY);
	}

	$engine->process();

	$view = new DiffusionCommentListView();
	$view->setMarkupEngine($engine);
	$view->setUser($user);
	$view->setComments($comments);
	$view->setInlineComments($inlines);
	$view->setPathMap($path_map);

	$phids = $view->getRequiredHandlePHIDs();
	$handles = $this->loadViewerHandles($phids);
	$view->setHandles($handles);

	return $view;
	}

	private function renderAddCommentPanel(
	PhabricatorRepositoryCommit $commit,
	array $audit_requests) {
	assert_instances_of($audit_requests, 'PhabricatorRepositoryAuditRequest');
	$user = $this->getRequest()->getUser();

	$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');

	$pane_id = celerity_generate_unique_node_id();
	Javelin::initBehavior(
	'differential-keyboard-navigation',
	array(
	'haunt' => $pane_id,
	));

	$draft = id(new PhabricatorDraft())->loadOneWhere(
	'authorPHID = %s AND draftKey = %s',
	$user->getPHID(),
	'diffusion-audit-'.$commit->getID());
	if ($draft) {
	$draft = $draft->getDraft();
	} else {
	$draft = null;
	}

	$actions = $this->getAuditActions($commit, $audit_requests);

	$form = id(new AphrontFormView())
	->setUser($user)
	->setAction('/audit/addcomment/')
	->addHiddenInput('commit', $commit->getPHID())
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel('Action')
	->setName('action')
	->setID('audit-action')
	->setOptions($actions))
	->appendChild(
	id(new AphrontFormTokenizerControl())
	->setLabel('Add Auditors')
	->setName('auditors')
	->setControlID('add-auditors')
	->setControlStyle('display: none')
	->setID('add-auditors-tokenizer')
	->setDisableBehavior(true))
	->appendChild(
	id(new AphrontFormTokenizerControl())
	->setLabel('Add CCs')
	->setName('ccs')
	->setControlID('add-ccs')
	->setControlStyle('display: none')
	->setID('add-ccs-tokenizer')
	->setDisableBehavior(true))
	->appendChild(
	id(new PhabricatorRemarkupControl())
	->setLabel('Comments')
	->setName('content')
	->setValue($draft)
	->setID('audit-content')
	->setUser($user))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue($is_serious ? 'Submit' : 'Cook the Books'));

	$panel = new AphrontPanelView();
	$panel->setHeader($is_serious ? 'Audit Commit' : 'Creative Accounting');
	$panel->appendChild($form);
	$panel->addClass('aphront-panel-accent');
	$panel->addClass('aphront-panel-flush');

	require_celerity_resource('phabricator-transaction-view-css');

	Javelin::initBehavior(
	'differential-add-reviewers-and-ccs',
	array(
	'dynamic' => array(
	'add-auditors-tokenizer' => array(
	'actions' => array('add_auditors' => 1),
	'src' => '/typeahead/common/users/',
	'row' => 'add-auditors',
	'ondemand' => PhabricatorEnv::getEnvConfig('tokenizer.ondemand'),
	'placeholder' => 'Type a user name...',
	),
	'add-ccs-tokenizer' => array(
	'actions' => array('add_ccs' => 1),
	'src' => '/typeahead/common/mailable/',
	'row' => 'add-ccs',
	'ondemand' => PhabricatorEnv::getEnvConfig('tokenizer.ondemand'),
	'placeholder' => 'Type a user or mailing list...',
	),
	),
	'select' => 'audit-action',
	));

	Javelin::initBehavior('differential-feedback-preview', array(
	'uri' => '/audit/preview/'.$commit->getID().'/',
	'preview' => 'audit-preview',
	'content' => 'audit-content',
	'action' => 'audit-action',
	'previewTokenizers' => array(
	'auditors' => 'add-auditors-tokenizer',
	'ccs' => 'add-ccs-tokenizer',
	),
	'inline' => 'inline-comment-preview',
	'inlineuri' => '/diffusion/inline/preview/'.$commit->getPHID().'/',
	));

	$preview_panel = hsprintf(
	'<div class="aphront-panel-preview aphront-panel-flush">
	<div id="audit-preview">
	<div class="aphront-panel-preview-loading-text">
	Loading preview...
	</div>
	</div>
	<div id="inline-comment-preview">
	</div>
	</div>');

	// TODO: This is pretty awkward, unify the CSS between Diffusion and
	// Differential better.
	require_celerity_resource('differential-core-view-css');

	return phutil_tag(
	'div',
	array(
	'id' => $pane_id,
	),
	hsprintf(
	'<div class="differential-add-comment-panel">%s%s%s</div>',
	id(new PhabricatorAnchorView())
	->setAnchorName('comment')
	->setNavigationMarker(true)
	->render(),
	$panel->render(),
	$preview_panel));
	}

	/**
	* Return a map of available audit actions for rendering into a <select />.
	* This shows the user valid actions, and does not show nonsense/invalid
	* actions (like closing an already-closed commit, or resigning from a commit
	* you have no association with).
	*/
	private function getAuditActions(
	PhabricatorRepositoryCommit $commit,
	array $audit_requests) {
	assert_instances_of($audit_requests, 'PhabricatorRepositoryAuditRequest');
	$user = $this->getRequest()->getUser();

	$user_is_author = ($commit->getAuthorPHID() == $user->getPHID());

	$user_request = null;
	foreach ($audit_requests as $audit_request) {
	if ($audit_request->getAuditorPHID() == $user->getPHID()) {
	$user_request = $audit_request;
	break;
	}
	}

	$actions = array();
	$actions[PhabricatorAuditActionConstants::COMMENT] = true;
	$actions[PhabricatorAuditActionConstants::ADD_CCS] = true;
	$actions[PhabricatorAuditActionConstants::ADD_AUDITORS] = true;

	// We allow you to accept your own commits. A use case here is that you
	// notice an issue with your own commit and "Raise Concern" as an indicator
	// to other auditors that you're on top of the issue, then later resolve it
	// and "Accept". You can not accept on behalf of projects or packages,
	// however.
	$actions[PhabricatorAuditActionConstants::ACCEPT] = true;
	$actions[PhabricatorAuditActionConstants::CONCERN] = true;


	// To resign, a user must have authority on some request and not be the
	// commit's author.
	if (!$user_is_author) {
	$may_resign = false;

	$authority_map = array_fill_keys($this->auditAuthorityPHIDs, true);
	foreach ($audit_requests as $request) {
	if (empty($authority_map[$request->getAuditorPHID()])) {
	continue;
	}
	$may_resign = true;
	break;
	}

	// If the user has already resigned, don't show "Resign...".
	$status_resigned = PhabricatorAuditStatusConstants::RESIGNED;
	if ($user_request) {
	if ($user_request->getAuditStatus() == $status_resigned) {
	$may_resign = false;
	}
	}

	if ($may_resign) {
	$actions[PhabricatorAuditActionConstants::RESIGN] = true;
	}
	}

	$status_concern = PhabricatorAuditCommitStatusConstants::CONCERN_RAISED;
	$concern_raised = ($commit->getAuditStatus() == $status_concern);
	$can_close_option = PhabricatorEnv::getEnvConfig(
	'audit.can-author-close-audit');
	if ($can_close_option && $user_is_author && $concern_raised) {
	$actions[PhabricatorAuditActionConstants::CLOSE] = true;
	}

	foreach ($actions as $constant => $ignored) {
	$actions[$constant] =
	PhabricatorAuditActionConstants::getActionName($constant);
	}

	return $actions;
	}

	private function buildMergesTable(PhabricatorRepositoryCommit $commit) {
	$drequest = $this->getDiffusionRequest();

	$limit = 50;

	$merge_query = DiffusionMergedCommitsQuery::newFromDiffusionRequest(
	$drequest);
	$merge_query->setLimit($limit + 1);
	$merges = $merge_query->loadMergedCommits();

	if (!$merges) {
	return null;
	}

	$caption = null;
	if (count($merges) > $limit) {
	$merges = array_slice($merges, 0, $limit);
	$caption =
	"This commit merges more than {$limit} changes. Only the first ".
	"{$limit} are shown.";
	}

	$history_table = new DiffusionHistoryTableView();
	$history_table->setUser($this->getRequest()->getUser());
	$history_table->setDiffusionRequest($drequest);
	$history_table->setHistory($merges);
	$history_table->loadRevisions();

	$phids = $history_table->getRequiredHandlePHIDs();
	$handles = $this->loadViewerHandles($phids);
	$history_table->setHandles($handles);

	$panel = new AphrontPanelView();
	$panel->setHeader('Merged Changes');
	$panel->setCaption($caption);
	$panel->appendChild($history_table);
	$panel->setNoBackground();

	return $panel;
	}

	private function renderHeadsupActionList(
	PhabricatorRepositoryCommit $commit,
	PhabricatorRepository $repository) {

	$request = $this->getRequest();
	$user = $request->getUser();

	$actions = id(new PhabricatorActionListView())
	->setUser($user)
	->setObject($commit);

	// TODO -- integrate permissions into whether or not this action is shown
	$uri = '/diffusion/'.$repository->getCallSign().'/commit/'.
	$commit->getCommitIdentifier().'/edit/';

	$action = id(new PhabricatorActionView())
	->setName('Edit Commit')
	->setHref($uri)
	->setIcon('edit');
	$actions->addAction($action);

	require_celerity_resource('phabricator-object-selector-css');
	require_celerity_resource('javelin-behavior-phabricator-object-selector');

	- if (PhabricatorEnv::getEnvConfig('maniphest.enabled')) {
	+ $maniphest = 'PhabricatorApplicationManiphest';
	+ if (PhabricatorApplication::isClassInstalled($maniphest)) {
	$action = id(new PhabricatorActionView())
	->setName('Edit Maniphest Tasks')
	->setIcon('attach')
	->setHref('/search/attach/'.$commit->getPHID().'/TASK/edge/')
	->setWorkflow(true);
	$actions->addAction($action);
	}

	if ($user->getIsAdmin()) {
	$action = id(new PhabricatorActionView())
	->setName('MetaMTA Transcripts')
	->setIcon('file')
	->setHref('/mail/?phid='.$commit->getPHID());
	$actions->addAction($action);
	}

	$action = id(new PhabricatorActionView())
	->setName('Herald Transcripts')
	->setIcon('file')
	->setHref('/herald/transcript/?phid='.$commit->getPHID())
	->setWorkflow(true);
	$actions->addAction($action);

	$action = id(new PhabricatorActionView())
	->setName('Download Raw Diff')
	->setHref($request->getRequestURI()->alter('diff', true))
	->setIcon('download');
	$actions->addAction($action);

	return $actions;
	}

	private function buildRefs(DiffusionRequest $request) {
	// Not turning this into a proper Query class since it's pretty simple,
	// one-off, and Git-specific.

	$type_git = PhabricatorRepositoryType::REPOSITORY_TYPE_GIT;

	$repository = $request->getRepository();
	if ($repository->getVersionControlSystem() != $type_git) {
	return null;
	}

	list($stdout) = $repository->execxLocalCommand(
	'log --format=%s -n 1 %s --',
	'%d',
	$request->getCommit());

	// %d, gives a weird output format
	// similar to (remote/one, remote/two, remote/three)
	$refs = trim($stdout, "() \n");
	if (!$refs) {
	return null;
	}
	$refs = explode(',', $refs);
	$refs = array_map('trim', $refs);

	$ref_links = array();
	foreach ($refs as $ref) {
	$ref_links[] = phutil_tag(
	'a',
	array(
	'href' => $request->generateURI(
	array(
	'action' => 'browse',
	'branch' => $ref,
	)),
	),
	$ref);
	}

	return phutil_implode_html(', ', $ref_links);
	}

	private function buildRawDiffResponse(DiffusionRequest $drequest) {
	$raw_query = DiffusionRawDiffQuery::newFromDiffusionRequest($drequest);
	$raw_diff = $raw_query->loadRawDiff();

	$file = PhabricatorFile::buildFromFileDataOrHash(
	$raw_diff,
	array(
	'name' => $drequest->getCommit().'.diff',
	));

	return id(new AphrontRedirectResponse())->setURI($file->getBestURI());
	}

	}
	diff --git a/src/applications/directory/controller/PhabricatorDirectoryMainController.php b/src/applications/directory/controller/PhabricatorDirectoryMainController.php
	index 622cc1bcff..0fa89e9052 100644
	--- a/src/applications/directory/controller/PhabricatorDirectoryMainController.php
	+++ b/src/applications/directory/controller/PhabricatorDirectoryMainController.php
	@@ -1,477 +1,478 @@
	<?php

	final class PhabricatorDirectoryMainController
	extends PhabricatorDirectoryController {

	private $filter;
	private $minipanels = array();

	public function willProcessRequest(array $data) {
	$this->filter = idx($data, 'filter');
	}

	public function processRequest() {
	$user = $this->getRequest()->getUser();

	if ($this->filter == 'jump') {
	return $this->buildJumpResponse();
	}

	$nav = $this->buildNav();

	$project_query = new PhabricatorProjectQuery();
	$project_query->setViewer($user);
	$project_query->withMemberPHIDs(array($user->getPHID()));
	$projects = $project_query->execute();

	return $this->buildMainResponse($nav, $projects);
	}

	private function buildMainResponse($nav, array $projects) {
	assert_instances_of($projects, 'PhabricatorProject');

	- if (PhabricatorEnv::getEnvConfig('maniphest.enabled')) {
	+ $maniphest = 'PhabricatorApplicationManiphest';
	+ if (PhabricatorApplication::isClassInstalled($maniphest)) {
	$unbreak_panel = $this->buildUnbreakNowPanel();
	$triage_panel = $this->buildNeedsTriagePanel($projects);
	$tasks_panel = $this->buildTasksPanel();
	} else {
	$unbreak_panel = null;
	$triage_panel = null;
	$tasks_panel = null;
	}

	if (PhabricatorEnv::getEnvConfig('welcome.html') !== null) {
	$welcome_panel = $this->buildWelcomePanel();
	} else {
	$welcome_panel = null;
	}
	$jump_panel = $this->buildJumpPanel();
	$revision_panel = $this->buildRevisionPanel();
	$audit_panel = $this->buildAuditPanel();
	$commit_panel = $this->buildCommitPanel();

	$content = array(
	$jump_panel,
	$welcome_panel,
	$unbreak_panel,
	$triage_panel,
	$revision_panel,
	$tasks_panel,
	$audit_panel,
	$commit_panel,
	$this->minipanels,
	);

	$nav->appendChild($content);
	$nav->appendChild(new PhabricatorGlobalUploadTargetView());

	return $this->buildApplicationPage(
	$nav,
	array(
	'title' => 'Phabricator',
	'device' => true,
	'dust' => true,
	));
	}

	private function buildJumpResponse() {
	$request = $this->getRequest();

	$jump = $request->getStr('jump');

	$response = PhabricatorJumpNavHandler::jumpPostResponse($jump);

	if ($response) {

	return $response;
	} else if ($request->isFormPost()) {
	$query = new PhabricatorSearchQuery();
	$query->setQuery($jump);
	$query->save();

	return id(new AphrontRedirectResponse())
	->setURI('/search/'.$query->getQueryKey().'/');
	} else {
	return id(new AphrontRedirectResponse())->setURI('/');
	}
	}

	private function buildUnbreakNowPanel() {
	$user = $this->getRequest()->getUser();
	$user_phid = $user->getPHID();

	$task_query = new ManiphestTaskQuery();
	$task_query->withStatus(ManiphestTaskQuery::STATUS_OPEN);
	$task_query->withPriority(ManiphestTaskPriority::PRIORITY_UNBREAK_NOW);
	$task_query->setLimit(10);

	$tasks = $task_query->execute();

	if (!$tasks) {
	return $this->renderMiniPanel(
	'No "Unbreak Now!" Tasks',
	'Nothing appears to be critically broken right now.');
	}

	$panel = new AphrontPanelView();
	$panel->setHeader('Unbreak Now!');
	$panel->setCaption('Open tasks with "Unbreak Now!" priority.');
	$panel->addButton(
	phutil_tag(
	'a',
	array(
	'href' => '/maniphest/view/all/',
	'class' => 'grey button',
	),
	"View All Unbreak Now \xC2\xBB"));

	$panel->appendChild($this->buildTaskListView($tasks));
	$panel->setNoBackground();

	return $panel;
	}

	private function buildNeedsTriagePanel(array $projects) {
	assert_instances_of($projects, 'PhabricatorProject');

	$user = $this->getRequest()->getUser();
	$user_phid = $user->getPHID();

	if ($projects) {
	$task_query = new ManiphestTaskQuery();
	$task_query->withStatus(ManiphestTaskQuery::STATUS_OPEN);
	$task_query->withPriority(ManiphestTaskPriority::PRIORITY_TRIAGE);
	$task_query->withAnyProjects(mpull($projects, 'getPHID'));
	$task_query->setLimit(10);
	$tasks = $task_query->execute();
	} else {
	$tasks = array();
	}

	if (!$tasks) {
	return $this->renderMiniPanel(
	'No "Needs Triage" Tasks',
	hsprintf(
	'No tasks in <a href="/project/">projects you are a member of</a> '.
	'need triage.'));
	}

	$panel = new AphrontPanelView();
	$panel->setHeader('Needs Triage');
	$panel->setCaption(hsprintf(
	'Open tasks with "Needs Triage" priority in '.
	'<a href="/project/">projects you are a member of</a>.'));

	$panel->addButton(
	phutil_tag(
	'a',
	array(
	// TODO: This should filter to just your projects' need-triage
	// tasks?
	'href' => '/maniphest/view/projecttriage/',
	'class' => 'grey button',
	),
	"View All Triage \xC2\xBB"));
	$panel->appendChild($this->buildTaskListView($tasks));
	$panel->setNoBackground();

	return $panel;
	}

	private function buildRevisionPanel() {
	$user = $this->getRequest()->getUser();
	$user_phid = $user->getPHID();

	$revision_query = new DifferentialRevisionQuery();
	$revision_query->withStatus(DifferentialRevisionQuery::STATUS_OPEN);
	$revision_query->withResponsibleUsers(array($user_phid));
	$revision_query->needRelationships(true);

	// NOTE: We need to unlimit this query to hit the responsible user
	// fast-path.
	$revision_query->setLimit(null);
	$revisions = $revision_query->execute();

	list($blocking, $active, ) = DifferentialRevisionQuery::splitResponsible(
	$revisions,
	array($user_phid));

	if (!$blocking && !$active) {
	return $this->renderMiniPanel(
	'No Waiting Revisions',
	'No revisions are waiting on you.');
	}

	$panel = new AphrontPanelView();
	$panel->setHeader('Revisions Waiting on You');
	$panel->setCaption('Revisions waiting for you for review or commit.');

	$panel->addButton(
	phutil_tag(
	'a',
	array(
	'href' => '/differential/',
	'class' => 'button grey',
	),
	"View Active Revisions \xC2\xBB"));

	$revision_view = id(new DifferentialRevisionListView())
	->setHighlightAge(true)
	->setRevisions(array_merge($blocking, $active))
	->setFields(DifferentialRevisionListView::getDefaultFields($user))
	->setUser($user)
	->loadAssets();
	$phids = array_merge(
	array($user_phid),
	$revision_view->getRequiredHandlePHIDs());
	$handles = $this->loadViewerHandles($phids);

	$revision_view->setHandles($handles);

	$panel->appendChild($revision_view);
	$panel->setNoBackground();

	return $panel;
	}

	private function buildWelcomePanel() {
	$panel = new AphrontPanelView();
	$panel->appendChild(
	phutil_safe_html(
	PhabricatorEnv::getEnvConfig('welcome.html')));
	$panel->setNoBackground();

	return $panel;
	}

	private function buildTasksPanel() {
	$user = $this->getRequest()->getUser();
	$user_phid = $user->getPHID();

	$task_query = new ManiphestTaskQuery();
	$task_query->withStatus(ManiphestTaskQuery::STATUS_OPEN);
	$task_query->setGroupBy(ManiphestTaskQuery::GROUP_PRIORITY);
	$task_query->withOwners(array($user_phid));
	$task_query->setLimit(10);

	$tasks = $task_query->execute();


	if (!$tasks) {
	return $this->renderMiniPanel(
	'No Assigned Tasks',
	'You have no assigned tasks.');
	}

	$panel = new AphrontPanelView();
	$panel->setHeader('Assigned Tasks');

	$panel->addButton(
	phutil_tag(
	'a',
	array(
	'href' => '/maniphest/',
	'class' => 'button grey',
	),
	"View Active Tasks \xC2\xBB"));
	$panel->appendChild($this->buildTaskListView($tasks));
	$panel->setNoBackground();

	return $panel;
	}

	private function buildTaskListView(array $tasks) {
	assert_instances_of($tasks, 'ManiphestTask');
	$user = $this->getRequest()->getUser();

	$phids = array_merge(
	array_filter(mpull($tasks, 'getOwnerPHID')),
	array_mergev(mpull($tasks, 'getProjectPHIDs')));

	$handles = $this->loadViewerHandles($phids);

	$view = new ManiphestTaskListView();
	$view->setTasks($tasks);
	$view->setUser($user);
	$view->setHandles($handles);

	return $view;
	}

	private function buildJumpPanel($query=null) {
	$request = $this->getRequest();
	$user = $request->getUser();

	$uniq_id = celerity_generate_unique_node_id();

	Javelin::initBehavior(
	'phabricator-autofocus',
	array(
	'id' => $uniq_id,
	));

	require_celerity_resource('phabricator-jump-nav');

	$doc_href = PhabricatorEnv::getDocLink('article/Jump_Nav_User_Guide.html');
	$doc_link = phutil_tag(
	'a',
	array(
	'href' => $doc_href,
	),
	'Jump Nav User Guide');

	$jump_input = phutil_tag(
	'input',
	array(
	'type' => 'text',
	'class' => 'phabricator-jump-nav',
	'name' => 'jump',
	'id' => $uniq_id,
	'value' => $query,
	));
	$jump_caption = phutil_tag(
	'p',
	array(
	'class' => 'phabricator-jump-nav-caption',
	),
	hsprintf(
	'Enter the name of an object like <tt>D123</tt> to quickly jump to '.
	'it. See %s or type <tt>help</tt>.',
	$doc_link));

	$form = phabricator_form(
	$user,
	array(
	'action' => '/jump/',
	'method' => 'POST',
	'class' => 'phabricator-jump-nav-form',
	),
	array(
	$jump_input,
	$jump_caption,
	));

	$panel = new AphrontPanelView();
	$panel->setHeader('Jump Nav');
	$panel->setNoBackground();
	// $panel->appendChild();

	$list_filter = new AphrontListFilterView();
	$list_filter->appendChild(phutil_tag('h1', array(), 'Jump Nav'));
	$list_filter->appendChild($form);

	$container = phutil_tag('div',
	array('class' => 'phabricator-jump-nav-container'),
	$list_filter);

	return $container;
	}

	private function renderMiniPanel($title, $body) {
	$panel = new AphrontMiniPanelView();
	$panel->appendChild(
	phutil_tag(
	'p',
	array(
	),
	array(
	phutil_tag('strong', array(), $title.': '),
	$body
	)));
	$this->minipanels[] = $panel;
	}

	public function buildAuditPanel() {
	$request = $this->getRequest();
	$user = $request->getUser();

	$phids = PhabricatorAuditCommentEditor::loadAuditPHIDsForUser($user);

	$query = new PhabricatorAuditQuery();
	$query->withAuditorPHIDs($phids);
	$query->withStatus(PhabricatorAuditQuery::STATUS_OPEN);
	$query->withAwaitingUser($user);
	$query->needCommitData(true);
	$query->setLimit(10);

	$audits = $query->execute();
	$commits = $query->getCommits();

	if (!$audits) {
	return $this->renderMinipanel(
	'No Audits',
	'No commits are waiting for you to audit them.');
	}

	$view = new PhabricatorAuditListView();
	$view->setAudits($audits);
	$view->setCommits($commits);
	$view->setUser($user);

	$phids = $view->getRequiredHandlePHIDs();
	$handles = $this->loadViewerHandles($phids);
	$view->setHandles($handles);

	$panel = new AphrontPanelView();
	$panel->setHeader('Audits');
	$panel->setCaption('Commits awaiting your audit.');
	$panel->appendChild($view);
	$panel->addButton(
	phutil_tag(
	'a',
	array(
	'href' => '/audit/',
	'class' => 'button grey',
	),
	"View Active Audits \xC2\xBB"));
	$panel->setNoBackground();

	return $panel;
	}

	public function buildCommitPanel() {
	$request = $this->getRequest();
	$user = $request->getUser();

	$phids = array($user->getPHID());

	$query = new PhabricatorAuditCommitQuery();
	$query->withAuthorPHIDs($phids);
	$query->withStatus(PhabricatorAuditCommitQuery::STATUS_CONCERN);
	$query->needCommitData(true);
	$query->setLimit(10);

	$commits = $query->execute();

	if (!$commits) {
	return $this->renderMinipanel(
	'No Problem Commits',
	'No one has raised concerns with your commits.');
	}

	$view = new PhabricatorAuditCommitListView();
	$view->setCommits($commits);
	$view->setUser($user);

	$phids = $view->getRequiredHandlePHIDs();
	$handles = $this->loadViewerHandles($phids);
	$view->setHandles($handles);

	$panel = new AphrontPanelView();
	$panel->setHeader('Problem Commits');
	$panel->setCaption('Commits which auditors have raised concerns about.');
	$panel->appendChild($view);
	$panel->addButton(
	phutil_tag(
	'a',
	array(
	'href' => '/audit/',
	'class' => 'button grey',
	),
	"View Problem Commits \xC2\xBB"));
	$panel->setNoBackground();

	return $panel;
	}

	}
	diff --git a/src/applications/maniphest/application/PhabricatorApplicationManiphest.php b/src/applications/maniphest/application/PhabricatorApplicationManiphest.php
	index 7d1e1d7e4f..a9fe4ec544 100644
	--- a/src/applications/maniphest/application/PhabricatorApplicationManiphest.php
	+++ b/src/applications/maniphest/application/PhabricatorApplicationManiphest.php
	@@ -1,119 +1,122 @@
	<?php

	final class PhabricatorApplicationManiphest extends PhabricatorApplication {

	public function getShortDescription() {
	return 'Tasks and Bugs';
	}

	public function getBaseURI() {
	return '/maniphest/';
	}

	- public function isEnabled() {
	- return PhabricatorEnv::getEnvConfig('maniphest.enabled');
	+ public function isInstalled() {
	+ if (!PhabricatorEnv::getEnvConfig('maniphest.enabled')) {
	+ return false;
	+ }
	+ return parent::isInstalled();
	}

	public function getIconName() {
	return 'maniphest';
	}

	public function getApplicationGroup() {
	return self::GROUP_CORE;
	}

	public function getApplicationOrder() {
	return 0.110;
	}

	public function getFactObjectsForAnalysis() {
	return array(
	new ManiphestTask(),
	);
	}

	public function getQuickCreateURI() {
	return $this->getBaseURI().'task/create/';
	}

	public function getEventListeners() {
	return array(
	new ManiphestPeopleMenuEventListener(),
	new ManiphestHovercardEventListener(),
	);
	}

	public function getRemarkupRules() {
	return array(
	new ManiphestRemarkupRule(),
	);
	}

	public function getRoutes() {
	return array(
	'/T(?P<id>[1-9]\d*)' => 'ManiphestTaskDetailController',
	'/maniphest/' => array(
	'' => 'ManiphestTaskListController',
	'view/(?P<view>\w+)/' => 'ManiphestTaskListController',
	'report/(?:(?P<view>\w+)/)?' => 'ManiphestReportController',
	'batch/' => 'ManiphestBatchEditController',
	'task/' => array(
	'create/' => 'ManiphestTaskEditController',
	'edit/(?P<id>[1-9]\d*)/' => 'ManiphestTaskEditController',
	'descriptionchange/(?:(?P<id>[1-9]\d*)/)?' =>
	'ManiphestTaskDescriptionChangeController',
	'descriptionpreview/' =>
	'ManiphestTaskDescriptionPreviewController',
	),
	'transaction/' => array(
	'save/' => 'ManiphestTransactionSaveController',
	'preview/(?P<id>[1-9]\d*)/'
	=> 'ManiphestTransactionPreviewController',
	),
	'export/(?P<key>[^/]+)/' => 'ManiphestExportController',
	'subpriority/' => 'ManiphestSubpriorityController',
	'custom/' => array(
	'' => 'ManiphestSavedQueryListController',
	'edit/(?:(?P<id>[1-9]\d*)/)?' => 'ManiphestSavedQueryEditController',
	'delete/(?P<id>[1-9]\d*)/' => 'ManiphestSavedQueryDeleteController',
	),
	),
	);
	}

	public function loadStatus(PhabricatorUser $user) {
	$status = array();

	$query = id(new ManiphestTaskQuery())
	->withStatus(ManiphestTaskQuery::STATUS_OPEN)
	->withPriority(ManiphestTaskPriority::PRIORITY_UNBREAK_NOW)
	->setLimit(1)
	->setCalculateRows(true);
	$query->execute();

	$count = $query->getRowCount();
	$type = PhabricatorApplicationStatusView::TYPE_NEEDS_ATTENTION;
	$status[] = id(new PhabricatorApplicationStatusView())
	->setType($type)
	->setText(pht('%d Unbreak Now Task(s)!', $count))
	->setCount($count);

	$query = id(new ManiphestTaskQuery())
	->withStatus(ManiphestTaskQuery::STATUS_OPEN)
	->withOwners(array($user->getPHID()))
	->setLimit(1)
	->setCalculateRows(true);
	$query->execute();

	$count = $query->getRowCount();
	$type = PhabricatorApplicationStatusView::TYPE_WARNING;
	$status[] = id(new PhabricatorApplicationStatusView())
	->setType($type)
	->setText(pht('%d Assigned Task(s)', $count))
	->setCount($count);

	return $status;
	}

	}

	diff --git a/src/applications/maniphest/config/PhabricatorManiphestConfigOptions.php b/src/applications/maniphest/config/PhabricatorManiphestConfigOptions.php
	index 97f91716d0..b8e64645d2 100644
	--- a/src/applications/maniphest/config/PhabricatorManiphestConfigOptions.php
	+++ b/src/applications/maniphest/config/PhabricatorManiphestConfigOptions.php
	@@ -1,117 +1,118 @@
	<?php

	final class PhabricatorManiphestConfigOptions
	extends PhabricatorApplicationConfigOptions {

	public function getName() {
	return pht("Maniphest");
	}

	public function getDescription() {
	return pht("Configure Maniphest.");
	}

	public function getOptions() {
	return array(
	$this->newOption('maniphest.enabled', 'bool', true)
	- ->setDescription(pht("Enable Maniphest")),
	+ ->setDescription(pht(
	+ "Deprecated, use 'phabricator.uninstalled-applications' instead.")),
	$this->newOption('maniphest.custom-fields', 'wild', array())
	->setSummary(pht("Custom Maniphest fields."))
	->setDescription(
	pht(
	"Array of custom fields for Maniphest tasks. For details on ".
	"adding custom fields to Maniphest, see 'Maniphest User Guide: ".
	"Adding Custom Fields'."))
	->addExample(
	'{"mycompany:estimated-hours": {"label": "Estimated Hours", '.
	'"type": "int", "caption": "Estimated number of hours this will '.
	'take.", "required": false}}',
	pht('Valid Setting')),
	$this->newOption(
	'maniphest.custom-task-extensions-class',
	'class',
	'ManiphestDefaultTaskExtensions')
	->setBaseClass('ManiphestTaskExtensions')
	->setSummary(pht("Class which drives custom field construction."))
	->setDescription(
	pht(
	"Class which drives custom field construction. See 'Maniphest ".
	"User Guide: Adding Custom Fields' in the documentation for more ".
	"information.")),
	$this->newOption('maniphest.default-priority', 'int', 90)
	->setSummary(pht("Default task priority for create flows."))
	->setDescription(
	pht(
	"What should the default task priority be in create flows? See ".
	"the constants in @{class:ManiphestTaskPriority} for valid ".
	"values. Defaults to 'needs triage'.")),
	$this->newOption(
	'metamta.maniphest.reply-handler-domain',
	'string',
	null)
	->setSummary(pht('Enable replying to tasks via email.'))
	->setDescription(
	pht(
	'You can configure a reply handler domain so that email sent from '.
	'Maniphest will have a special "Reply To" address like '.
	'"T123+82+af19f@example.com" that allows recipients to reply by '.
	'email and interact with tasks. For instructions on configurating '.
	'reply handlers, see the article "Configuring Inbound Email" in '.
	'the Phabricator documentation. By default, this is set to `null` '.
	'and Phabricator will use a generic `noreply@` address or the '.
	'address of the acting user instead of a special reply handler '.
	'address (see `metamta.default-address`). If you set a domain '.
	'here, Phabricator will begin generating private reply handler '.
	'addresses. See also `metamta.maniphest.reply-handler` to further '.
	'configure behavior. This key should be set to the domain part '.
	'after the @, like "example.com".')),
	$this->newOption(
	'metamta.maniphest.reply-handler',
	'class',
	'ManiphestReplyHandler')
	->setBaseClass('PhabricatorMailReplyHandler')
	->setDescription(pht('Override reply handler class.')),
	$this->newOption(
	'metamta.maniphest.subject-prefix',
	'string',
	'[Maniphest]')
	->setDescription(pht('Subject prefix for Maniphest mail.')),
	$this->newOption(
	'metamta.maniphest.public-create-email',
	'string',
	null)
	->setSummary(pht('Allow filing bugs via email.'))
	->setDescription(
	pht(
	'You can configure an email address like '.
	'"bugs@phabricator.example.com" which will automatically create '.
	'Maniphest tasks when users send email to it. This relies on the '.
	'"From" address to authenticate users, so it is is not completely '.
	'secure. To set this up, enter a complete email address like '.
	'"bugs@phabricator.example.com" and then configure mail to that '.
	'address so it routed to Phabricator (if you\'ve already '.
	'configured reply handlers, you\'re probably already done). See '.
	'"Configuring Inbound Email" in the documentation for more '.
	'information.')),
	$this->newOption(
	'metamta.maniphest.default-public-author',
	'string',
	null)
	->setSummary(pht('Username anonymous bugs are filed under.'))
	->setDescription(
	pht(
	'If you enable `metamta.maniphest.public-create-email` and create '.
	'an email address like "bugs@phabricator.example.com", it will '.
	'default to rejecting mail which doesn\'t come from a known user. '.
	'However, you might want to let anyone send email to this '.
	'address; to do so, set a default author here (a Phabricator '.
	'username). A typical use of this might be to create a "System '.
	'Agent" user called "bugs" and use that name here. If you specify '.
	'a valid username, mail will always be accepted and used to '.
	'create a task, even if the sender is not a system user. The '.
	'original email address will be stored in an `From Email` field '.
	'on the task.')),
	);
	}

	}
	diff --git a/src/applications/phriction/application/PhabricatorApplicationPhriction.php b/src/applications/phriction/application/PhabricatorApplicationPhriction.php
	index bf0423b237..9ee98ff27b 100644
	--- a/src/applications/phriction/application/PhabricatorApplicationPhriction.php
	+++ b/src/applications/phriction/application/PhabricatorApplicationPhriction.php
	@@ -1,63 +1,66 @@
	<?php

	final class PhabricatorApplicationPhriction extends PhabricatorApplication {

	public function getShortDescription() {
	return pht('Wiki');
	}

	public function getBaseURI() {
	return '/w/';
	}

	public function getIconName() {
	return 'phriction';
	}

	public function getHelpURI() {
	return PhabricatorEnv::getDoclink('article/Phriction_User_Guide.html');
	}

	- public function isEnabled() {
	- return PhabricatorEnv::getEnvConfig('phriction.enabled');
	+ public function isInstalled() {
	+ if (!PhabricatorEnv::getEnvConfig('phriction.enabled')) {
	+ return false;
	+ }
	+ return parent::isInstalled();
	}

	public function getTitleGlyph() {
	return "\xE2\x9A\xA1";
	}

	public function getRoutes() {
	return array(
	// Match "/w/" with slug "/".
	'/w(?P<slug>/)' => 'PhrictionDocumentController',
	// Match "/w/x/y/z/" with slug "x/y/z/".
	'/w/(?P<slug>.+/)' => 'PhrictionDocumentController',

	'/phriction/' => array(
	'' => 'PhrictionListController',
	'list/(?P<view>[^/]+)/' => 'PhrictionListController',

	'history(?P<slug>/)' => 'PhrictionHistoryController',
	'history/(?P<slug>.+/)' => 'PhrictionHistoryController',

	'edit/(?:(?P<id>[1-9]\d*)/)?' => 'PhrictionEditController',
	'delete/(?P<id>[1-9]\d*)/' => 'PhrictionDeleteController',
	'new/' => 'PhrictionNewController',
	'move/(?:(?P<id>[1-9]\d*)/)?' => 'PhrictionMoveController',

	'preview/' => 'PhrictionDocumentPreviewController',
	'diff/(?P<id>[1-9]\d*)/' => 'PhrictionDiffController',
	),
	);
	}

	public function getApplicationGroup() {
	return self::GROUP_COMMUNICATION;
	}

	public function getApplicationOrder() {
	return 0.140;
	}

	}

	diff --git a/src/applications/phriction/config/PhabricatorPhrictionConfigOptions.php b/src/applications/phriction/config/PhabricatorPhrictionConfigOptions.php
	index d9a2da237a..a8e80e5667 100644
	--- a/src/applications/phriction/config/PhabricatorPhrictionConfigOptions.php
	+++ b/src/applications/phriction/config/PhabricatorPhrictionConfigOptions.php
	@@ -1,29 +1,30 @@
	<?php

	final class PhabricatorPhrictionConfigOptions
	extends PhabricatorApplicationConfigOptions {

	public function getName() {
	return pht("Phriction");
	}

	public function getDescription() {
	return pht("Options related to Phriction (wiki).");
	}

	public function getOptions() {
	return array(
	$this->newOption('phriction.enabled', 'bool', true)
	->setBoolOptions(
	array(
	pht("Enable Phriction"),
	pht("Disable Phriction"),
	))
	- ->setDescription(pht("Enable or disable Phriction.")),
	+ ->setDescription(pht(
	+ "Deprecated, use 'phabricator.uninstalled-applications' instead.")),
	$this->newOption(
	'metamta.phriction.subject-prefix', 'string', '[Phriction]')
	->setDescription(pht("Subject prefix for Phriction email.")),
	);
	}

	}
	diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelConpherencePreferences.php b/src/applications/settings/panel/PhabricatorSettingsPanelConpherencePreferences.php
	index 838d88f113..708ab2ba80 100644
	--- a/src/applications/settings/panel/PhabricatorSettingsPanelConpherencePreferences.php
	+++ b/src/applications/settings/panel/PhabricatorSettingsPanelConpherencePreferences.php
	@@ -1,79 +1,78 @@
	<?php

	final class PhabricatorSettingsPanelConpherencePreferences
	extends PhabricatorSettingsPanel {

	public function isEnabled() {
	- $conpherence_app = PhabricatorApplication::getByClass(
	+ return PhabricatorApplication::isClassInstalled(
	'PhabricatorApplicationConpherence');
	- return $conpherence_app->isInstalled();
	}

	public function getPanelKey() {
	return 'conpherence';
	}

	public function getPanelName() {
	return pht('Conpherence Preferences');
	}

	public function getPanelGroup() {
	return pht('Application Settings');
	}

	public function processRequest(AphrontRequest $request) {
	$user = $request->getUser();
	$preferences = $user->loadPreferences();

	$pref = PhabricatorUserPreferences::PREFERENCE_CONPH_NOTIFICATIONS;

	if ($request->isFormPost()) {
	$notifications = $request->getInt($pref);
	$preferences->setPreference($pref, $notifications);
	$preferences->save();
	return id(new AphrontRedirectResponse())
	->setURI($this->getPanelURI('?saved=true'));
	}

	$form = id(new AphrontFormView())
	->setUser($user)
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel(pht('Conpherence Notifications'))
	->setName($pref)
	->setValue($preferences->getPreference($pref))
	->setOptions(
	array(
	ConpherenceSettings::EMAIL_ALWAYS
	=> pht('Email Always'),
	ConpherenceSettings::NOTIFICATIONS_ONLY
	=> pht('Notifications Only'),
	))
	->setCaption(
	pht('Should Conpherence send emails for updates or '.
	'notifications only? This global setting can be overridden '.
	'on a per-thread basis within Conpherence.')))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue(pht('Save Preferences')));

	$panel = new AphrontPanelView();
	$panel->setHeader(pht('Conpherence Preferences'));
	$panel->appendChild($form);
	$panel->setNoBackground();

	$error_view = null;
	if ($request->getBool('saved')) {
	$error_view = id(new AphrontErrorView())
	->setTitle(pht('Preferences Saved'))
	->setSeverity(AphrontErrorView::SEVERITY_NOTICE)
	->setErrors(array(pht('Your preferences have been saved.')));
	}

	return array(
	$error_view,
	$panel,
	);
	}
	}

	diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php b/src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php
	index 7199345259..655cbd1f46 100644
	--- a/src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php
	+++ b/src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php
	@@ -1,294 +1,298 @@
	<?php

	final class PhabricatorSettingsPanelEmailPreferences
	extends PhabricatorSettingsPanel {

	public function getPanelKey() {
	return 'emailpreferences';
	}

	public function getPanelName() {
	return pht('Email Preferences');
	}

	public function getPanelGroup() {
	return pht('Email');
	}

	public function processRequest(AphrontRequest $request) {
	$user = $request->getUser();

	$preferences = $user->loadPreferences();

	$pref_re_prefix = PhabricatorUserPreferences::PREFERENCE_RE_PREFIX;
	$pref_vary = PhabricatorUserPreferences::PREFERENCE_VARY_SUBJECT;
	$pref_no_self_mail = PhabricatorUserPreferences::PREFERENCE_NO_SELF_MAIL;

	$errors = array();
	if ($request->isFormPost()) {

	if (PhabricatorMetaMTAMail::shouldMultiplexAllMail()) {
	if ($request->getStr($pref_re_prefix) == 'default') {
	$preferences->unsetPreference($pref_re_prefix);
	} else {
	$preferences->setPreference(
	$pref_re_prefix,
	$request->getBool($pref_re_prefix));
	}

	if ($request->getStr($pref_vary) == 'default') {
	$preferences->unsetPreference($pref_vary);
	} else {
	$preferences->setPreference(
	$pref_vary,
	$request->getBool($pref_vary));
	}
	}

	$preferences->setPreference(
	$pref_no_self_mail,
	$request->getStr($pref_no_self_mail));

	$new_tags = $request->getArr('mailtags');
	$mailtags = $preferences->getPreference('mailtags', array());
	$all_tags = $this->getMailTags();
	- if (!PhabricatorEnv::getEnvConfig('maniphest.enabled')) {
	+
	+ $maniphest = 'PhabricatorApplicationManiphest';
	+ if (!PhabricatorApplication::isClassInstalled($maniphest)) {
	$all_tags = array_diff_key($all_tags, $this->getManiphestMailTags());
	}
	+
	foreach ($all_tags as $key => $label) {
	$mailtags[$key] = (bool)idx($new_tags, $key, false);
	}
	$preferences->setPreference('mailtags', $mailtags);

	$preferences->save();

	return id(new AphrontRedirectResponse())
	->setURI($this->getPanelURI('?saved=true'));
	}

	$notice = null;
	if (!$errors) {
	if ($request->getStr('saved')) {
	$notice = new AphrontErrorView();
	$notice->setSeverity(AphrontErrorView::SEVERITY_NOTICE);
	$notice->setTitle(pht('Changes Saved'));
	$notice->appendChild(
	phutil_tag('p', array(), pht('Your changes have been saved.')));
	}
	} else {
	$notice = new AphrontErrorView();
	$notice->setTitle(pht('Form Errors'));
	$notice->setErrors($errors);
	}

	$re_prefix_default = PhabricatorEnv::getEnvConfig('metamta.re-prefix')
	? pht('Enabled')
	: pht('Disabled');

	$vary_default = PhabricatorEnv::getEnvConfig('metamta.vary-subjects')
	? pht('Vary')
	: pht('Do Not Vary');

	$re_prefix_value = $preferences->getPreference($pref_re_prefix);
	if ($re_prefix_value === null) {
	$re_prefix_value = 'default';
	} else {
	$re_prefix_value = $re_prefix_value
	? 'true'
	: 'false';
	}

	$vary_value = $preferences->getPreference($pref_vary);
	if ($vary_value === null) {
	$vary_value = 'default';
	} else {
	$vary_value = $vary_value
	? 'true'
	: 'false';
	}

	$form = new AphrontFormView();
	$form
	->setUser($user)
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel(pht('Self Actions'))
	->setName($pref_no_self_mail)
	->setOptions(
	array(
	'0' => pht('Send me an email when I take an action'),
	'1' => pht('Do not send me an email when I take an action'),
	))
	->setCaption(pht('You can disable email about your own actions.'))
	->setValue($preferences->getPreference($pref_no_self_mail, 0)));

	if (PhabricatorMetaMTAMail::shouldMultiplexAllMail()) {
	$re_control = id(new AphrontFormSelectControl())
	->setName($pref_re_prefix)
	->setOptions(
	array(
	'default' => pht('Use Server Default (%s)', $re_prefix_default),
	'true' => pht('Enable "Re:" prefix'),
	'false' => pht('Disable "Re:" prefix'),
	))
	->setValue($re_prefix_value);

	$vary_control = id(new AphrontFormSelectControl())
	->setName($pref_vary)
	->setOptions(
	array(
	'default' => pht('Use Server Default (%s)', $vary_default),
	'true' => pht('Vary Subjects'),
	'false' => pht('Do Not Vary Subjects'),
	))
	->setValue($vary_value);
	} else {
	$re_control = id(new AphrontFormStaticControl())
	->setValue('Server Default ('.$re_prefix_default.')');

	$vary_control = id(new AphrontFormStaticControl())
	->setValue('Server Default ('.$vary_default.')');
	}

	$form
	->appendChild(
	$re_control
	->setLabel(pht('Add "Re:" Prefix'))
	->setCaption(
	pht('Enable this option to fix threading in Mail.app on OS X Lion,'.
	' or if you like "Re:" in your email subjects.')))
	->appendChild(
	$vary_control
	->setLabel(pht('Vary Subjects'))
	->setCaption(
	pht('This option adds more information to email subjects, but may '.
	'break threading in some clients.')));

	$form
	->appendChild(hsprintf(
	'<br />'.
	'<p class="aphront-form-instructions">%s</p>'.
	'<p class="aphront-form-instructions">'.
	'<strong>%s</strong> %s</p>',
	pht('You can customize what mail you receive from Phabricator here.'),
	pht('NOTE:'),
	pht('If an update makes several changes (like '.
	'adding CCs to a task, closing it, and adding a comment) you will '.
	'still receive an email as long as at least one of the changes '.
	'is set to notify you.')));

	$mailtags = $preferences->getPreference('mailtags', array());

	$form
	->appendChild(
	$this->buildMailTagCheckboxes(
	$this->getDifferentialMailTags(),
	$mailtags)
	->setLabel(pht('Differential')));

	- if (PhabricatorEnv::getEnvConfig('maniphest.enabled')) {
	+ $maniphest = 'PhabricatorApplicationManiphest';
	+ if (PhabricatorApplication::isClassInstalled($maniphest)) {
	$form->appendChild(
	$this->buildMailTagCheckboxes(
	$this->getManiphestMailTags(),
	$mailtags)
	->setLabel(pht('Maniphest')));
	}

	$form
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue(pht('Save Preferences')));

	$panel = new AphrontPanelView();
	$panel->setHeader(pht('Email Preferences'));
	$panel->appendChild($form);
	$panel->setNoBackground();

	return id(new AphrontNullView())
	->appendChild(
	array(
	$notice,
	$panel,
	));
	}

	private function getMailTags() {
	return array(
	MetaMTANotificationType::TYPE_DIFFERENTIAL_REVIEWERS =>
	pht("Send me email when a revision's reviewers change."),
	MetaMTANotificationType::TYPE_DIFFERENTIAL_CLOSED =>
	pht("Send me email when a revision is closed."),
	MetaMTANotificationType::TYPE_DIFFERENTIAL_CC =>
	pht("Send me email when a revision's CCs change."),
	MetaMTANotificationType::TYPE_DIFFERENTIAL_COMMENT =>
	pht("Send me email when a revision is commented on."),
	MetaMTANotificationType::TYPE_DIFFERENTIAL_UPDATED =>
	pht("Send me email when a revision is updated."),
	MetaMTANotificationType::TYPE_DIFFERENTIAL_REVIEW_REQUEST =>
	pht("Send me email when I am requested to review a revision."),
	MetaMTANotificationType::TYPE_DIFFERENTIAL_OTHER =>
	pht("Send me email for any other activity not listed above."),

	MetaMTANotificationType::TYPE_MANIPHEST_STATUS =>
	pht("Send me email when a task's status changes."),
	MetaMTANotificationType::TYPE_MANIPHEST_OWNER =>
	pht("Send me email when a task's owner changes."),
	MetaMTANotificationType::TYPE_MANIPHEST_PRIORITY =>
	pht("Send me email when a task's priority changes."),
	MetaMTANotificationType::TYPE_MANIPHEST_CC =>
	pht("Send me email when a task's CCs change."),
	MetaMTANotificationType::TYPE_MANIPHEST_PROJECTS =>
	pht("Send me email when a task's associated projects change."),
	MetaMTANotificationType::TYPE_MANIPHEST_COMMENT =>
	pht("Send me email when a task is commented on."),
	MetaMTANotificationType::TYPE_MANIPHEST_OTHER =>
	pht("Send me email for any other activity not listed above."),

	);
	}

	private function getManiphestMailTags() {
	return array_select_keys(
	$this->getMailTags(),
	array(
	MetaMTANotificationType::TYPE_MANIPHEST_STATUS,
	MetaMTANotificationType::TYPE_MANIPHEST_OWNER,
	MetaMTANotificationType::TYPE_MANIPHEST_PRIORITY,
	MetaMTANotificationType::TYPE_MANIPHEST_CC,
	MetaMTANotificationType::TYPE_MANIPHEST_PROJECTS,
	MetaMTANotificationType::TYPE_MANIPHEST_COMMENT,
	MetaMTANotificationType::TYPE_MANIPHEST_OTHER,
	));
	}

	private function getDifferentialMailTags() {
	return array_select_keys(
	$this->getMailTags(),
	array(
	MetaMTANotificationType::TYPE_DIFFERENTIAL_REVIEWERS,
	MetaMTANotificationType::TYPE_DIFFERENTIAL_CLOSED,
	MetaMTANotificationType::TYPE_DIFFERENTIAL_CC,
	MetaMTANotificationType::TYPE_DIFFERENTIAL_COMMENT,
	MetaMTANotificationType::TYPE_DIFFERENTIAL_UPDATED,
	MetaMTANotificationType::TYPE_DIFFERENTIAL_REVIEW_REQUEST,
	MetaMTANotificationType::TYPE_DIFFERENTIAL_OTHER,
	));
	}

	private function buildMailTagCheckboxes(
	array $tags,
	array $prefs) {

	$control = new AphrontFormCheckboxControl();
	foreach ($tags as $key => $label) {
	$control->addCheckbox(
	'mailtags['.$key.']',
	1,
	$label,
	idx($prefs, $key, 1));
	}

	return $control;
	}

	}
	diff --git a/src/view/page/menu/PhabricatorMainMenuView.php b/src/view/page/menu/PhabricatorMainMenuView.php
	index 2c56e7f50c..bf3220ee0f 100644
	--- a/src/view/page/menu/PhabricatorMainMenuView.php
	+++ b/src/view/page/menu/PhabricatorMainMenuView.php
	@@ -1,387 +1,385 @@
	<?php

	final class PhabricatorMainMenuView extends AphrontView {

	private $defaultSearchScope;
	private $controller;
	private $applicationMenu;

	public function setApplicationMenu(PhabricatorMenuView $application_menu) {
	$this->applicationMenu = $application_menu;
	return $this;
	}

	public function getApplicationMenu() {
	return $this->applicationMenu;
	}

	public function setController(PhabricatorController $controller) {
	$this->controller = $controller;
	return $this;
	}

	public function getController() {
	return $this->controller;
	}

	public function setDefaultSearchScope($default_search_scope) {
	$this->defaultSearchScope = $default_search_scope;
	return $this;
	}

	public function getDefaultSearchScope() {
	return $this->defaultSearchScope;
	}

	public function render() {
	$user = $this->user;

	require_celerity_resource('phabricator-main-menu-view');

	$header_id = celerity_generate_unique_node_id();
	$menus = array();
	$alerts = array();
	$search_button = '';
	$app_button = '';

	if ($user->isLoggedIn()) {
	list($menu, $dropdown) = $this->renderNotificationMenu();
	$alerts[] = $menu;
	$menus[] = $dropdown;
	$app_button = $this->renderApplicationMenuButton($header_id);
	$search_button = $this->renderSearchMenuButton($header_id);
	}

	$search_menu = $this->renderPhabricatorSearchMenu();

	if ($alerts) {
	$alerts = phutil_tag(
	'div',
	array(
	'class' => 'phabricator-main-menu-alerts',
	),
	$alerts);
	}

	$application_menu = $this->renderApplicationMenu();

	return phutil_tag(
	'div',
	array(
	'class' => 'phabricator-main-menu',
	'id' => $header_id,
	),
	array(
	$app_button,
	$search_button,
	$this->renderPhabricatorLogo(),
	$alerts,
	$application_menu,
	$search_menu,
	$menus,
	));
	}

	private function renderSearch() {
	$user = $this->user;

	$result = null;

	$keyboard_config = array(
	'helpURI' => '/help/keyboardshortcut/',
	);

	if ($user->isLoggedIn()) {
	$search = new PhabricatorMainMenuSearchView();
	$search->setUser($user);
	$search->setScope($this->getDefaultSearchScope());
	$result = $search;

	$pref_shortcut = PhabricatorUserPreferences::PREFERENCE_SEARCH_SHORTCUT;
	if ($user->loadPreferences()->getPreference($pref_shortcut, true)) {
	$keyboard_config['searchID'] = $search->getID();
	}
	}

	Javelin::initBehavior('phabricator-keyboard-shortcuts', $keyboard_config);

	if ($result) {
	$result = id(new PhabricatorMenuItemView())
	->addClass('phabricator-main-menu-search')
	->appendChild($result);
	}

	return $result;
	}

	public function renderApplicationMenuButton($header_id) {
	$button_id = celerity_generate_unique_node_id();
	return javelin_tag(
	'a',
	array(
	'class' => 'phabricator-main-menu-expand-button '.
	'phabricator-expand-search-menu',
	'sigil' => 'jx-toggle-class',
	'meta' => array(
	'map' => array(
	$header_id => 'phabricator-application-menu-expanded',
	$button_id => 'menu-icon-app-blue',
	),
	),
	),
	phutil_tag(
	'span',
	array(
	'class' => 'phabricator-menu-button-icon sprite-menu menu-icon-app',
	'id' => $button_id,
	),
	''));
	}

	public function renderApplicationMenu() {
	$user = $this->getUser();
	$controller = $this->getController();

	$applications = PhabricatorApplication::getAllInstalledApplications();

	$actions = array();
	foreach ($applications as $application) {
	if ($application->shouldAppearInLaunchView()) {
	$app_actions = $application->buildMainMenuItems($user, $controller);
	foreach ($app_actions as $action) {
	$actions[] = $action;
	}
	}
	}

	$view = $this->getApplicationMenu();

	if (!$view) {
	$view = new PhabricatorMenuView();
	}

	$view->addClass('phabricator-dark-menu');
	$view->addClass('phabricator-application-menu');

	if ($actions) {
	$view->addMenuItem(
	id(new PhabricatorMenuItemView())
	->addClass('phabricator-core-item-device')
	->setType(PhabricatorMenuItemView::TYPE_LABEL)
	->setName(pht('Actions')));
	foreach ($actions as $action) {
	$icon = $action->getIcon();
	if ($icon) {
	if ($action->getSelected()) {
	$action->appendChild($this->renderMenuIcon($icon.'-blue-large'));
	} else {
	$action->appendChild($this->renderMenuIcon($icon.'-light-large'));
	}
	}
	$view->addMenuItem($action);
	}
	}

	if ($user->isLoggedIn()) {
	$view->addMenuItem(
	id(new PhabricatorMenuItemView())
	->addClass('phabricator-menu-item-type-link')
	->addClass('phabricator-core-menu-item')
	->setName(pht('Log Out'))
	->setHref('/logout/')
	->appendChild($this->renderMenuIcon('power-light-large')));
	}

	return $view;
	}

	public function renderSearchMenuButton($header_id) {
	$button_id = celerity_generate_unique_node_id();
	return javelin_tag(
	'a',
	array(
	'class' => 'phabricator-main-menu-search-button '.
	'phabricator-expand-application-menu',
	'sigil' => 'jx-toggle-class',
	'meta' => array(
	'map' => array(
	$header_id => 'phabricator-search-menu-expanded',
	$button_id => 'menu-icon-search-blue',
	),
	),
	),
	phutil_tag(
	'span',
	array(
	'class' => 'phabricator-menu-button-icon sprite-menu menu-icon-search',
	'id' => $button_id,
	),
	''));
	}

	private function renderPhabricatorSearchMenu() {

	$view = new PhabricatorMenuView();
	$view->addClass('phabricator-dark-menu');
	$view->addClass('phabricator-search-menu');

	$search = $this->renderSearch();
	if ($search) {
	$view->addMenuItem($search);
	}

	return $view;
	}

	private function renderPhabricatorLogo() {
	return phutil_tag(
	'a',
	array(
	'class' => 'phabricator-main-menu-logo',
	'href' => '/',
	),
	phutil_tag(
	'span',
	array(
	'class' => 'sprite-menu phabricator-main-menu-logo-image',
	),
	''));
	}

	private function renderNotificationMenu() {
	$user = $this->user;

	require_celerity_resource('phabricator-notification-css');
	require_celerity_resource('phabricator-notification-menu-css');
	require_celerity_resource('sprite-menu-css');

	$container_classes = array(
	'sprite-menu',
	'alert-notifications',
	);

	- $conpherence_application = PhabricatorApplication::getByClass(
	- 'PhabricatorApplicationConpherence');
	-
	$message_tag = '';
	- if ($conpherence_application->isInstalled()) {
	+ $conpherence = 'PhabricatorApplicationConpherence';
	+ if (PhabricatorApplication::isClassInstalled($conpherence)) {
	$message_id = celerity_generate_unique_node_id();
	$message_count_id = celerity_generate_unique_node_id();

	$unread_status = ConpherenceParticipationStatus::BEHIND;
	$unread = id(new ConpherenceParticipantQuery())
	->withParticipantPHIDs(array($user->getPHID()))
	->withParticipationStatus($unread_status)
	->execute();
	$message_count_number = count($unread);
	if ($message_count_number > 999) {
	$message_count_number = "\xE2\x88\x9E";
	}

	$message_count_tag = phutil_tag(
	'span',
	array(
	'id' => $message_count_id,
	'class' => 'phabricator-main-menu-message-count'
	),
	$message_count_number);

	$message_icon_tag = phutil_tag(
	'span',
	array(
	'class' => 'sprite-menu phabricator-main-menu-message-icon',
	),
	'');

	if ($message_count_number) {
	$container_classes[] = 'message-unread';
	}

	$message_tag = phutil_tag(
	'a',
	array(
	'href' => '/conpherence/',
	'class' => implode(' ', $container_classes),
	'id' => $message_id,
	),
	array(
	$message_icon_tag,
	$message_count_tag,
	));
	}

	$count_id = celerity_generate_unique_node_id();
	$dropdown_id = celerity_generate_unique_node_id();
	$bubble_id = celerity_generate_unique_node_id();

	$count_number = id(new PhabricatorFeedStoryNotification())
	->countUnread($user);

	if ($count_number > 999) {
	$count_number = "\xE2\x88\x9E";
	}

	$count_tag = phutil_tag(
	'span',
	array(
	'id' => $count_id,
	'class' => 'phabricator-main-menu-alert-count'
	),
	$count_number);

	$icon_tag = phutil_tag(
	'span',
	array(
	'class' => 'sprite-menu phabricator-main-menu-alert-icon',
	),
	'');

	if ($count_number) {
	$container_classes[] = 'alert-unread';
	}

	$bubble_tag = phutil_tag(
	'a',
	array(
	'href' => '/notification/',
	'class' => implode(' ', $container_classes),
	'id' => $bubble_id,
	),
	array($icon_tag, $count_tag));

	Javelin::initBehavior(
	'aphlict-dropdown',
	array(
	'bubbleID' => $bubble_id,
	'countID' => $count_id,
	'dropdownID' => $dropdown_id,
	'loadingText' => pht('Loading...'),
	));

	$notification_dropdown = javelin_tag(
	'div',
	array(
	'id' => $dropdown_id,
	'class' => 'phabricator-notification-menu',
	'sigil' => 'phabricator-notification-menu',
	'style' => 'display: none;',
	),
	'');

	return array(
	hsprintf('%s%s', $bubble_tag, $message_tag),
	$notification_dropdown,
	);
	}

	private function renderMenuIcon($name) {
	return phutil_tag(
	'span',
	array(
	'class' => 'phabricator-core-menu-icon '.
	'sprite-apps-large app-'.$name,
	),
	'');
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Sun, Jan 19, 18:02 (1 w, 5 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1127218
Default Alt Text: (197 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions