| Index: trunk/tools/make-wmf-branch/default.conf |
| — | — | @@ -6,7 +6,6 @@ |
| 7 | 7 | $normalExtensions = array( |
| 8 | 8 | 'AbuseFilter', |
| 9 | 9 | 'ActiveAbstract', |
| 10 | | - 'AjaxTest', |
| 11 | 10 | 'AntiBot', |
| 12 | 11 | 'AntiSpoof', |
| 13 | 12 | 'AssertEdit', |
| — | — | @@ -19,9 +18,10 @@ |
| 20 | 19 | 'ClientSide', |
| 21 | 20 | 'CodeReview', |
| 22 | 21 | 'Collection', |
| | 22 | + 'CommunityApplications', |
| | 23 | + 'CommunityHiring', |
| 23 | 24 | 'CommunityVoice', |
| 24 | 25 | 'ConditionalShowSection', |
| 25 | | - 'Configure', |
| 26 | 26 | 'ConfirmEdit', |
| 27 | 27 | 'ContactPage', |
| 28 | 28 | 'ContactPageFundraiser', |
| — | — | @@ -31,25 +31,20 @@ |
| 32 | 32 | 'DismissableSiteNotice', |
| 33 | 33 | 'DonationInterface', |
| 34 | 34 | 'DoubleWiki', |
| 35 | | - 'Drafts', |
| 36 | 35 | 'DumpHTML', |
| 37 | 36 | 'ExpandTemplates', |
| 38 | 37 | 'ExtensionDistributor', |
| 39 | | - 'ExternalPages', |
| 40 | | - 'FixedImage', |
| 41 | 38 | 'FormPreloadPostCache', |
| 42 | 39 | 'FundraiserPortal', |
| 43 | 40 | 'Gadgets', |
| 44 | | - 'GeoLite', |
| 45 | 41 | 'GlobalBlocking', |
| 46 | 42 | 'GlobalUsage', |
| 47 | | - 'HoneypotIntegration', |
| 48 | 43 | 'ImageMap', |
| 49 | 44 | 'InputBox', |
| 50 | 45 | 'intersection', |
| 51 | 46 | 'LabeledSectionTransclusion', |
| | 47 | + 'LandingCheck', |
| 52 | 48 | 'LocalisationUpdate', |
| 53 | | - 'MiniDonation', |
| 54 | 49 | 'MWReleases', |
| 55 | 50 | 'MWSearch', |
| 56 | 51 | 'NewUserMessage', |
| — | — | @@ -77,6 +72,7 @@ |
| 78 | 73 | 'skins', |
| 79 | 74 | 'SlippyMap', |
| 80 | 75 | 'SpamBlacklist', |
| | 76 | + 'StrategyWiki', // needed? Ask Andrew |
| 81 | 77 | 'StringFunctionsEscaped', |
| 82 | 78 | 'SyntaxHighlight_GeSHi', |
| 83 | 79 | 'Throttle', |
| — | — | @@ -89,17 +85,26 @@ |
| 90 | 86 | 'UnicodeConverter', |
| 91 | 87 | 'UploadBlacklist', |
| 92 | 88 | 'UploadWizard', |
| | 89 | + 'VariablePage', // still used? Ask Arthur or Kaldari |
| 93 | 90 | 'wikidiff', |
| 94 | 91 | 'wikidiff2', |
| 95 | 92 | 'wikihiero', |
| 96 | 93 | 'WikimediaMessages', |
| | 94 | + 'WikimediaMobile', |
| 97 | 95 | ); |
| 98 | 96 | |
| 99 | 97 | $specialExtensions = array( |
| 100 | | - 'LiquidThreads_alpha' => '^/branches/wmf/1.16wmf3/extensions/LiquidThreads_alpha', |
| 101 | | - 'LiquidThreads' => '^/branches/wmf/1.16wmf3/extensions/LiquidThreads', |
| 102 | | - 'FlaggedRevs' => '^/branches/wmf/1.16wmf3/extensions/FlaggedRevs', |
| 103 | | - 'UsabilityInitiative' => '^/branches/wmf/1.16wmf3/extensions/UsabilityInitiative', |
| | 98 | + 'LiquidThreads_alpha' => '^/branches/wmf/1.16wmf4/extensions/LiquidThreads_alpha', |
| | 99 | + 'LiquidThreads' => '^/branches/wmf/1.16wmf4/extensions/LiquidThreads', |
| | 100 | + 'FlaggedRevs' => '^/branches/wmf/1.16wmf4/extensions/FlaggedRevs', // Needed? Chad will find out |
| | 101 | + 'ArticleAssessmentPilot' => '^/branches/wmf/1.16wmf4/extensions/ArticleAssessmentPilot', |
| | 102 | + 'CentralNotice' => '^/branches/wmf/1.16wmf4/extensions/CentralNotice', |
| | 103 | + 'ContributionReporting' => '^/branches/wmf/1.16wmf4/extensions/ContributionReporting', |
| | 104 | + 'ContributionTracking' => '^/branches/wmf/1.16wmf4/extensions/ContributionTracking', |
| | 105 | + 'DonationInterface' => '^/branches/wmf/1.16wmf4/extensions/DonationInterface', |
| | 106 | + 'FundraiserPortal' => '^/branches/wmf/1.16wmf4/extensions/FundraiserPortal', |
| | 107 | + 'LandingCheck' => '^/branches/wmf/1.16wmf4/extensions/LandingCheck', |
| | 108 | + 'VariablePage' => '^/branches/wmf/1.16wmf4/extensions/VariablePage', |
| 104 | 109 | ); |
| 105 | 110 | |
| 106 | 111 | $preservedItems = array( |
| — | — | @@ -110,7 +115,7 @@ |
| 111 | 116 | 'maintenance/storage/testRctComplete.php', |
| 112 | 117 | 'maintenance/storage/make-all-blobs', |
| 113 | 118 | |
| 114 | | - # Not needed because we copy from 1.16wmf3 for now |
| | 119 | + # Not needed because we copy from 1.16wmf4 for now |
| 115 | 120 | #'extensions/FlaggedRevs/maintenance/wikimedia-periodic-update.sh', |
| 116 | 121 | ); |
| 117 | 122 | |
| — | — | @@ -124,12 +129,20 @@ |
| 125 | 130 | # Needs conflict resolution |
| 126 | 131 | # array( 'rev' => 56394, 'base' => '^/branches/wmf/1.16wmf3' ), |
| 127 | 132 | |
| | 133 | + // memcached->APC in LanguageConverter. TODO: Ask Tim if this is needed |
| 128 | 134 | array( 'rev' => 60970, 'base' => '^/branches/wmf/1.16wmf3' ), |
| 129 | | - |
| 130 | | - # Not needed for a copy from 1.16wmf3, may be needed for a future copy from trunk |
| 131 | | - #array( 'rev' => 62002, 'base' => '^/branches/wmf/1.16wmf3' ), |
| 132 | 135 | |
| | 136 | + // Suppress logging DB reconnections if more than 5 mins have elapsed |
| | 137 | + array( 'rev' => 67177, 'base' => '^/branches/wmf/1.16wmf4' ), |
| | 138 | + |
| | 139 | + // Reduce cache size for RepoGroup cache |
| 133 | 140 | array( 'rev' => 69199, 'base' => '^/branches/wmf/1.16wmf4' ), |
| | 141 | + |
| | 142 | + // Protect against fatals in Profiler.php |
| | 143 | + array( 'rev' => 76243, 'base' => '^/branches/wmf/1.16wmf4' ), |
| | 144 | + |
| | 145 | + // thumb.php hack for thumbs of temp files |
| | 146 | + array( 'rev' => 77266, 'base' => '^/branches/wmf/1.16wmf4' ), |
| 134 | 147 | ); |
| 135 | 148 | |
| 136 | 149 | $dryRun = false; |