Merge "Remove $wgEnotifUseJobQ"

diff --combined RELEASE-NOTES-1.27
index ff2b22d,566be0d..35ce6c2
--- 1/RELEASE-NOTES-1.27
--- 2/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@@ -94,10 -94,12 +94,11 @@@ production
  * LoginForm::getLoginToken() and LoginForm::getCreateaccountToken()
    return a MediaWiki\Session\Token, and tokens must be checked using that
    class's methods.
+ * $wgEnotifUseJobQ was removed and the job queue is always used.
  
  === New features in 1.27 ===
 -* $wgDataCenterId and $wgDataCenterRoles where added, which will serve as
 -  basic configuration settings needed for multi-datacenter setups.
 -  $wgDataCenterUpdateStickTTL was also added.
 +* $wgDataCenterUpdateStickTTL was also added. This decides how long a user
 +  sticks to the primary DC (via cookies) after they make changes to the site.
  * Added a new hook, 'UserMailerTransformContent', to transform the contents
    of an email. This is similar to the EmailUser hook but applies to all mail
    sent via UserMailer.

diff --combined includes/DefaultSettings.php
index 8431f87,c6c616a..c892629
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -1628,12 -1628,6 +1628,6 @@@ $wgEnotifImpersonal = false
   */
  $wgEnotifMaxRecips = 500;
  
- /**
-  * Send mails via the job queue. This can be useful to reduce the time it
-  * takes to save a page that a lot of people are watching.
-  */
- $wgEnotifUseJobQ = false;
- 
  /**
   * Use real name instead of username in e-mail "from" field.
   */
@@@ -1871,6 -1865,24 +1865,6 @@@ $wgDBservers = false
   */
  $wgLBFactoryConf = array( 'class' => 'LBFactorySimple' );
  
 -/**
 - * The ID of the current data center
 - * @since 1.27
 - */
 -$wgDataCenterId = 'default';
 -
 -/**
 - * Map of data center IDs to their role ("master" or "slave")
 - *
 - * Multiple data centers can be setup to handle MediaWiki, with HTTP
 - * POSTs routed to the master data center and GET/HEAD/OPTION routed to
 - * any data center (usually the closest to the end user). In such setups,
 - * this setting should be set to the appropriate value in the site
 - * config for each data center.
 - * @since 1.27
 - */
 -$wgDataCenterRoles = array( 'default' => 'master' );
 -
  /**
   * After a state-changing request is done by a client, this determines
   * how many seconds that client should keep using the master datacenter.
@@@ -7672,7 -7684,6 +7666,6 @@@ $wgHTTPConnectTimeout = 5e0
  
  /************************************************************************//**
   * @name   Job queue
-  * See also $wgEnotifUseJobQ.
   * @{
   */