Projects
Infrastructure
phabricator
Log In
Username
Password
We truncated the diff of some files because they were too big. If you want to see the full diff for every file,
click here
.
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 42
View file
phabricator.spec
Changed
@@ -5,7 +5,7 @@ Summary: An open software engineering platform Name: phabricator Version: 0.%{revision_date}.git%{git_short_version_hash} -Release: 3%{?dist} +Release: 5%{?dist} License: ASL 2.0 Group: Applications/Productivity URL: http://www.phabricator.org/ @@ -57,9 +57,11 @@ # packaging/stable/0009-unbundle-twilio Patch0009: 0009-Unbundle-twilio.patch +# packaging/stable/0010-version-info +Patch0010: 0010-No-version-information-can-be-obtained-using-git-use.patch + # feature/stable/0001-create-accounts-inbound-email -Patch0010: 0010-Create-user-account-on-inbound-email.patch -Patch0011: 0011-Create-the-user-account-only-if-there-is-not-a-defau.patch +Patch0011: 0011-Create-user-account-on-inbound-email.patch # feature/stable/0002-no-requiring-top-replies Patch0012: 0012-Do-not-require-top-replies-only.patch @@ -69,24 +71,23 @@ # feature/stable/0004-pht-title Patch0014: 0014-Allow-the-title-to-be-overriden.patch -Patch0015: 0015-Translate-Phabricator-in-welcome-emails.patch # feature/stable/0005-revert-obsolete-buildApplicationPage-removal -Patch0016: 0016-Revert-Removed-unused-buildApplicationPage-method-fr.patch +Patch0015: 0015-Revert-Removed-unused-buildApplicationPage-method-fr.patch # Unvendorized system dependencies Requires: cowsay Requires: figlet Requires: php-PHPMailer -Requires: arcanist >= 0.20161026 -Requires: arcanist <= 0.20161227 +Requires: arcanist >= 0.20160825 +Requires: arcanist <= 0.20170227 Requires: git-core Requires: httpd Requires: nodejs Requires: nodejs-ws -Requires: phabricator(libphutil) >= 0.20161026 -Requires: phabricator(libphutil) <= 0.20161227 +Requires: phabricator(libphutil) >= 0.20160825 +Requires: phabricator(libphutil) <= 0.20170227 Requires: php-curl Requires: php-iconv Requires: php-pecl-mailparse @@ -118,41 +119,40 @@ externals/httpful/ \ externals/restful/ -%patch0001 -p1 -b .figlet +%patch0001 -p1 rm -rf externals/figlet -%patch0002 -p1 -b .cowsay +%patch0002 -p1 rm -rf externals/cowsay -%patch0003 -p1 -b .wordlist +%patch0003 -p1 rm -rf externals/wordlist -%patch0004 -p1 -b .amazon-ses +%patch0004 -p1 rm -rf externals/amazon-ses -%patch0005 -p1 -b .pear-figlet +%patch0005 -p1 rm -rf externals/pear-figlet -%patch0006 -p1 -b .phpmailer +%patch0006 -p1 rm -rf externals/phpmailer -%patch0007 -p1 -b .stripe +%patch0007 -p1 rm -rf externals/stripe-php -%patch0008 -p1 -b .wepay +%patch0008 -p1 rm -rf externals/wepay -%patch0009 -p1 -b .twilio +%patch0009 -p1 rm -rf externals/twilio-php # features (arguably) -%patch0010 -p1 -b .user-accounts -%patch0011 -p1 -b .default-user -%patch0012 -p1 -b .top-replies -%patch0013 -p1 -b .display-name -%patch0014 -p1 -b .pht-title -%patch0015 -p1 -b .welcome-email -%patch0016 -p1 -b .buildApplicationPage +%patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 +%patch0014 -p1 +%patch0015 -p1 grep -rlE '/usr/local/bin|bin/env' . | xargs sed -i -e ' 1 { s,/usr/local/bin/php,/usr/bin/php, @@ -290,6 +290,12 @@ %attr(0775, phabricator, phabricator) %{_var}/log/phabricator %changelog +* Thu Dec 01 2016 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.20161126.gitcfcc3b8-5 +- Rebuild + +* Thu Dec 01 2016 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.20161126.gitcfcc3b8-4 +- Rebuild + * Thu Dec 01 2016 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.20161126.gitcfcc3b8-3 - Rebuild
View file
0001-Unbundle-figlet.patch
Changed
@@ -1,7 +1,7 @@ -From b4f045309ff8fba76284e90fc68a52b5469178b8 Mon Sep 17 00:00:00 2001 +From fcfa706e201f403ac27dc8271228ddd593fc81fe Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com> Date: Wed, 10 Aug 2016 11:02:12 +0200 -Subject: [PATCH 01/16] Unbundle figlet +Subject: [PATCH 01/15] Unbundle figlet --- .../markup/interpreter/PhabricatorRemarkupFigletBlockInterpreter.php | 3 +-- @@ -23,5 +23,5 @@ $map = array(); -- -2.7.4 +2.9.3
View file
0002-Unbundle-cowsay.patch
Changed
@@ -1,7 +1,7 @@ -From 26ac7920289d6c066a1666a6b86390b882b040c6 Mon Sep 17 00:00:00 2001 +From a952f9847d0356154cf5e5256e96a762552e02fc Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com> Date: Wed, 10 Aug 2016 11:04:37 +0200 -Subject: [PATCH 02/16] Unbundle cowsay +Subject: [PATCH 02/15] Unbundle cowsay --- .../markup/interpreter/PhabricatorRemarkupCowsayBlockInterpreter.php | 2 +- @@ -21,5 +21,5 @@ $root.'/resources/cows/custom/', ); -- -2.7.4 +2.9.3
View file
0003-Unbundle-wordlist.patch
Changed
@@ -1,7 +1,7 @@ -From 4e6ce6e55ba9a4a23726d2dc0b85a866841d731c Mon Sep 17 00:00:00 2001 +From 3216b41a2ad8e1ec38bbf2ed1006a39a7543b594 Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com> Date: Wed, 10 Aug 2016 11:06:20 +0200 -Subject: [PATCH 03/16] Unbundle wordlist +Subject: [PATCH 03/15] Unbundle wordlist --- .../auth/constants/PhabricatorCommonPasswords.php | 29 ++-------------------- @@ -54,5 +54,5 @@ } -- -2.7.4 +2.9.3
View file
0004-Unbundle-Amazon-SES.patch
Changed
@@ -1,7 +1,7 @@ -From 455ed0e879738cddf65c4484cb8d15d46c155097 Mon Sep 17 00:00:00 2001 +From fa229d8f4e82f7b730859585beefee10cce98313 Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com> Date: Wed, 10 Aug 2016 11:08:11 +0200 -Subject: [PATCH 04/16] Unbundle Amazon SES +Subject: [PATCH 04/15] Unbundle Amazon SES --- externals/phpmailer/class.phpmailer-lite.php | 6 -- @@ -30,10 +30,10 @@ $sendAction = $this->SendmailSend($header, $body); return $sendAction; diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php -index f4a7ba2..fb34375 100644 +index dfde2bc..0d65c8f 100644 --- a/src/__phutil_library_map__.php +++ b/src/__phutil_library_map__.php -@@ -2767,7 +2767,6 @@ phutil_register_library_map(array( +@@ -2861,7 +2861,6 @@ phutil_register_library_map(array( 'PhabricatorMailEmailHeraldFieldGroup' => 'applications/metamta/herald/PhabricatorMailEmailHeraldFieldGroup.php', 'PhabricatorMailEmailSubjectHeraldField' => 'applications/metamta/herald/PhabricatorMailEmailSubjectHeraldField.php', 'PhabricatorMailImplementationAdapter' => 'applications/metamta/adapter/PhabricatorMailImplementationAdapter.php', @@ -41,7 +41,7 @@ 'PhabricatorMailImplementationMailgunAdapter' => 'applications/metamta/adapter/PhabricatorMailImplementationMailgunAdapter.php', 'PhabricatorMailImplementationPHPMailerAdapter' => 'applications/metamta/adapter/PhabricatorMailImplementationPHPMailerAdapter.php', 'PhabricatorMailImplementationPHPMailerLiteAdapter' => 'applications/metamta/adapter/PhabricatorMailImplementationPHPMailerLiteAdapter.php', -@@ -7608,7 +7607,6 @@ phutil_register_library_map(array( +@@ -7841,7 +7840,6 @@ phutil_register_library_map(array( 'PhabricatorMailEmailHeraldFieldGroup' => 'HeraldFieldGroup', 'PhabricatorMailEmailSubjectHeraldField' => 'PhabricatorMailEmailHeraldField', 'PhabricatorMailImplementationAdapter' => 'Phobject', @@ -202,5 +202,5 @@ - -} -- -2.7.4 +2.9.3
View file
0005-Unbundle-pear-figlet.patch
Changed
@@ -1,7 +1,7 @@ -From 35856a2ed1265975afa51eb56833ec95ec0c2f63 Mon Sep 17 00:00:00 2001 +From d3f79cdb1f954f9712fa9458e73287e56ad6361d Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com> Date: Wed, 10 Aug 2016 11:09:35 +0200 -Subject: [PATCH 05/16] Unbundle pear-figlet +Subject: [PATCH 05/15] Unbundle pear-figlet --- .../interpreter/PhabricatorRemarkupFigletBlockInterpreter.php | 7 ++----- @@ -35,5 +35,5 @@ $map = array(); -- -2.7.4 +2.9.3
View file
0006-Unbundle-phpmailer.patch
Changed
@@ -1,7 +1,7 @@ -From c04696d1c6bcb718f31d210bb2bf8a0744100855 Mon Sep 17 00:00:00 2001 +From 5c8d1b63da376b2f3e61cae531f5d8f4a637e154 Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com> Date: Wed, 10 Aug 2016 11:11:06 +0200 -Subject: [PATCH 06/16] Unbundle phpmailer +Subject: [PATCH 06/15] Unbundle phpmailer --- src/__phutil_library_map__.php | 1 - @@ -13,10 +13,10 @@ delete mode 100644 src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerLiteAdapter.php diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php -index fb34375..b27f8c6 100644 +index 0d65c8f..d9b6844 100644 --- a/src/__phutil_library_map__.php +++ b/src/__phutil_library_map__.php -@@ -2769,7 +2769,6 @@ phutil_register_library_map(array( +@@ -2863,7 +2863,6 @@ phutil_register_library_map(array( 'PhabricatorMailImplementationAdapter' => 'applications/metamta/adapter/PhabricatorMailImplementationAdapter.php', 'PhabricatorMailImplementationMailgunAdapter' => 'applications/metamta/adapter/PhabricatorMailImplementationMailgunAdapter.php', 'PhabricatorMailImplementationPHPMailerAdapter' => 'applications/metamta/adapter/PhabricatorMailImplementationPHPMailerAdapter.php', @@ -196,5 +196,5 @@ - -} -- -2.7.4 +2.9.3
View file
0007-Unbundle-stripe.patch
Changed
@@ -1,7 +1,7 @@ -From d1f608692c68b42ff48109dfc8d24b92f1d945cc Mon Sep 17 00:00:00 2001 +From 41bdd5296f05bc4f5bc770875ce62bf643a26674 Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com> Date: Wed, 10 Aug 2016 12:12:21 +0200 -Subject: [PATCH 07/16] Unbundle stripe +Subject: [PATCH 07/15] Unbundle stripe --- resources/celerity/map.php | 2 - @@ -15,10 +15,10 @@ delete mode 100644 webroot/rsrc/js/application/phortune/behavior-stripe-payment-form.js diff --git a/resources/celerity/map.php b/resources/celerity/map.php -index 78ec532..4ff2172 100644 +index 9c8fa7b..02bc1ea 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php -@@ -488,7 +488,6 @@ return array( +@@ -430,7 +430,6 @@ return array( 'rsrc/js/application/passphrase/passphrase-credential-control.js' => '3cb0b2fc', 'rsrc/js/application/pholio/behavior-pholio-mock-edit.js' => 'bee502c8', 'rsrc/js/application/pholio/behavior-pholio-mock-view.js' => 'fbe497e7', @@ -26,7 +26,7 @@ 'rsrc/js/application/phortune/behavior-test-payment-form.js' => 'fc91ab6c', 'rsrc/js/application/phortune/phortune-credit-card-form.js' => '2290aeef', 'rsrc/js/application/policy/behavior-policy-control.js' => 'd0c516d5', -@@ -772,7 +771,6 @@ return array( +@@ -711,7 +710,6 @@ return array( 'javelin-behavior-select-on-click' => '4e3e79a6', 'javelin-behavior-setup-check-https' => '491416b3', 'javelin-behavior-slowvote-embed' => '887ad43f', @@ -35,10 +35,10 @@ 'javelin-behavior-time-typeahead' => '522431f7', 'javelin-behavior-toggle-class' => '92b9ec77', diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php -index b27f8c6..5379f15 100644 +index d9b6844..e286f70 100644 --- a/src/__phutil_library_map__.php +++ b/src/__phutil_library_map__.php -@@ -4134,7 +4134,6 @@ phutil_register_library_map(array( +@@ -4253,7 +4253,6 @@ phutil_register_library_map(array( 'PhortunePurchasePHIDType' => 'applications/phortune/phid/PhortunePurchasePHIDType.php', 'PhortunePurchaseQuery' => 'applications/phortune/query/PhortunePurchaseQuery.php', 'PhortuneSchemaSpec' => 'applications/phortune/storage/PhortuneSchemaSpec.php', @@ -46,7 +46,7 @@ 'PhortuneSubscription' => 'applications/phortune/storage/PhortuneSubscription.php', 'PhortuneSubscriptionCart' => 'applications/phortune/cart/PhortuneSubscriptionCart.php', 'PhortuneSubscriptionEditController' => 'applications/phortune/controller/PhortuneSubscriptionEditController.php', -@@ -9290,7 +9289,6 @@ phutil_register_library_map(array( +@@ -9547,7 +9546,6 @@ phutil_register_library_map(array( 'PhortunePurchasePHIDType' => 'PhabricatorPHIDType', 'PhortunePurchaseQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', 'PhortuneSchemaSpec' => 'PhabricatorConfigSchemaSpec', @@ -529,5 +529,5 @@ - var ccform = new JX.PhortuneCreditCardForm(JX.$(config.formID), onsubmit); -}); -- -2.7.4 +2.9.3
View file
0008-Unbundle-wepay.patch
Changed
@@ -1,7 +1,7 @@ -From cdd222132be9289831d198daa3601cdee291dbba Mon Sep 17 00:00:00 2001 +From d5ddac046e2e72c9c98fd52ac7ab1f5a72b753b4 Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com> Date: Wed, 10 Aug 2016 11:58:02 +0200 -Subject: [PATCH 08/16] Unbundle wepay +Subject: [PATCH 08/15] Unbundle wepay --- resources/sprite/manifest/login.json | 5 - @@ -27,10 +27,10 @@ "name": "login-WordPressCOM", "rule": ".login-WordPressCOM", diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php -index 5379f15..a233442 100644 +index e286f70..ceed269 100644 --- a/src/__phutil_library_map__.php +++ b/src/__phutil_library_map__.php -@@ -4147,7 +4147,6 @@ phutil_register_library_map(array( +@@ -4266,7 +4266,6 @@ phutil_register_library_map(array( 'PhortuneSubscriptionViewController' => 'applications/phortune/controller/PhortuneSubscriptionViewController.php', 'PhortuneSubscriptionWorker' => 'applications/phortune/worker/PhortuneSubscriptionWorker.php', 'PhortuneTestPaymentProvider' => 'applications/phortune/provider/PhortuneTestPaymentProvider.php', @@ -38,7 +38,7 @@ 'PhragmentBrowseController' => 'applications/phragment/controller/PhragmentBrowseController.php', 'PhragmentCanCreateCapability' => 'applications/phragment/capability/PhragmentCanCreateCapability.php', 'PhragmentConduitAPIMethod' => 'applications/phragment/conduit/PhragmentConduitAPIMethod.php', -@@ -9305,7 +9304,6 @@ phutil_register_library_map(array( +@@ -9562,7 +9561,6 @@ phutil_register_library_map(array( 'PhortuneSubscriptionViewController' => 'PhortuneController', 'PhortuneSubscriptionWorker' => 'PhabricatorWorker', 'PhortuneTestPaymentProvider' => 'PhortunePaymentProvider', @@ -458,5 +458,5 @@ - -} -- -2.7.4 +2.9.3
View file
0009-Unbundle-twilio.patch
Changed
@@ -1,7 +1,7 @@ -From 9806482fa8e9ddea04d47cf139ba547336460257 Mon Sep 17 00:00:00 2001 +From ce9027e3408ff4977281ffd798510bed6f2ee0e1 Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com> Date: Wed, 10 Aug 2016 12:36:17 +0200 -Subject: [PATCH 09/16] Unbundle twilio +Subject: [PATCH 09/15] Unbundle twilio --- scripts/sms/manage_sms.php | 21 ----- @@ -63,10 +63,10 @@ -$workflows[] = new PhutilHelpArgumentWorkflow(); -$args->parseWorkflows($workflows); diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php -index a233442..c6c762d 100644 +index ceed269..7969e03 100644 --- a/src/__phutil_library_map__.php +++ b/src/__phutil_library_map__.php -@@ -3491,19 +3491,6 @@ phutil_register_library_map(array( +@@ -3600,19 +3600,6 @@ phutil_register_library_map(array( 'PhabricatorResourceSite' => 'aphront/site/PhabricatorResourceSite.php', 'PhabricatorRobotsController' => 'applications/system/controller/PhabricatorRobotsController.php', 'PhabricatorS3FileStorageEngine' => 'applications/files/engine/PhabricatorS3FileStorageEngine.php', @@ -86,7 +86,7 @@ 'PhabricatorSQLPatchList' => 'infrastructure/storage/patch/PhabricatorSQLPatchList.php', 'PhabricatorSSHKeyGenerator' => 'infrastructure/util/PhabricatorSSHKeyGenerator.php', 'PhabricatorSSHKeysSettingsPanel' => 'applications/settings/panel/PhabricatorSSHKeysSettingsPanel.php', -@@ -8511,19 +8498,6 @@ phutil_register_library_map(array( +@@ -8758,19 +8745,6 @@ phutil_register_library_map(array( 'PhabricatorResourceSite' => 'PhabricatorSite', 'PhabricatorRobotsController' => 'PhabricatorController', 'PhabricatorS3FileStorageEngine' => 'PhabricatorFileStorageEngine', @@ -845,5 +845,5 @@ -abstract class PhabricatorSMSWorker - extends PhabricatorWorker {} -- -2.7.4 +2.9.3
View file
0010-Create-user-account-on-inbound-email.patch
Deleted
@@ -1,169 +0,0 @@ -From b039ee7d18afb3534c3f2e67fffd229b8c8a062c Mon Sep 17 00:00:00 2001 -From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com> -Date: Wed, 10 Aug 2016 11:11:56 +0200 -Subject: [PATCH 10/16] Create user account on inbound email. - -This patch allows an inbound email to create a full, new user account. - -This way, Phabricator triggers the initial response ('Maniphest task created'), -and actual subsequent comments and changes to the Maniphest task are sent to the -author of the inbound email that created the ticket. ---- - .../metamta/receiver/PhabricatorMailReceiver.php | 114 ++++++++++++++++++--- - 1 file changed, 99 insertions(+), 15 deletions(-) - -diff --git a/src/applications/metamta/receiver/PhabricatorMailReceiver.php b/src/applications/metamta/receiver/PhabricatorMailReceiver.php -index 07d364b..6fa0dba 100644 ---- a/src/applications/metamta/receiver/PhabricatorMailReceiver.php -+++ b/src/applications/metamta/receiver/PhabricatorMailReceiver.php -@@ -94,12 +94,14 @@ abstract class PhabricatorMailReceiver extends Phobject { - */ - public function loadSender(PhabricatorMetaMTAReceivedMail $mail) { - $raw_from = $mail->getHeader('From'); -- $from = self::getRawAddress($raw_from); -+ $from = id(new PhutilEmailAddress($raw_from)) -+ ->getAddress(); - - $reasons = array(); - - // Try to find a user with this email address. - $user = PhabricatorUser::loadOneWithEmailAddress($from); -+ - if ($user) { - return $user; - } else { -@@ -115,9 +117,11 @@ abstract class PhabricatorMailReceiver extends Phobject { - $reply_to_key = 'metamta.insecure-auth-with-reply-to'; - $allow_reply_to = PhabricatorEnv::getEnvConfig($reply_to_key); - if ($allow_reply_to) { -- $reply_to = self::getRawAddress($raw_reply_to); -+ $reply_to = id(new PhutilEmailAddress($raw_reply_to)) -+ ->getAddress(); - - $user = PhabricatorUser::loadOneWithEmailAddress($reply_to); -+ - if ($user) { - return $user; - } else { -@@ -138,20 +142,39 @@ abstract class PhabricatorMailReceiver extends Phobject { - // account for them if we're configured for it. - $email_key = 'phabricator.allow-email-users'; - $allow_email_users = PhabricatorEnv::getEnvConfig($email_key); -+ - if ($allow_email_users) { -- $from_obj = new PhutilEmailAddress($from); -- $xuser = id(new PhabricatorExternalAccountQuery()) -- ->setViewer($this->getViewer()) -- ->withAccountTypes(array('email')) -- ->withAccountDomains(array($from_obj->getDomainName(), 'self')) -- ->withAccountIDs(array($from_obj->getAddress())) -- ->requireCapabilities( -- array( -- PhabricatorPolicyCapability::CAN_VIEW, -- PhabricatorPolicyCapability::CAN_EDIT, -- )) -- ->loadOneOrCreate(); -- return $xuser->getPhabricatorUser(); -+ if (empty($raw_from) && !empty($raw_reply_to)) { -+ $raw_from = $raw_reply_to; -+ } -+ -+ $from = new PhutilEmailAddress($raw_from); -+ $email_address = $from->getAddress(); -+ $realname = $from->getDisplayName(); -+ -+ if (empty($realname)) { -+ $realname = $this->generateRealname(); -+ } -+ -+ $username = $this->generateUsername($realname); -+ -+ $admin = PhabricatorUser::getOmnipotentUser(); -+ $user = new PhabricatorUser(); -+ $user->setUsername($username); -+ $user->setRealname($realname); -+ $user->setIsApproved(1); -+ -+ $email_object = id(new PhabricatorUserEmail()) -+ ->setAddress($email_address) -+ ->setIsVerified(1); -+ -+ id(new PhabricatorUserEditor()) -+ ->setActor($admin) -+ ->createNewUser($user, $email_object); -+ -+ //$user->sendWelcomeEmail($admin); -+ -+ return $user; - } else { - $reasons[] = pht( - 'Phabricator is also not configured to allow unknown external users '. -@@ -268,4 +291,65 @@ abstract class PhabricatorMailReceiver extends Phobject { - return trim(phutil_utf8_strtolower($address)); - } - -+ protected function generateRealname() { -+ $realname_generator = new PhutilRealNameContextFreeGrammar(); -+ $random_real_name = $realname_generator->generate(); -+ return $random_real_name; -+ } -+ -+ protected function generateUsername($random_real_name) { -+ $name = strtolower($random_real_name); -+ $name = preg_replace('/[^a-z]/s' , ' ', $name); -+ $name = preg_replace('/\s+/', ' ', $name); -+ $words = explode(' ', $name); -+ $random = rand(0, 4); -+ $reduced = ''; -+ if ($random == 0) { -+ foreach ($words as $w) { -+ if ($w == end($words)) { -+ $reduced .= $w; -+ } else { -+ $reduced .= $w[0]; -+ } -+ } -+ } else if ($random == 1) { -+ foreach ($words as $w) { -+ if ($w == $words[0]) { -+ $reduced .= $w; -+ } else { -+ $reduced .= $w[0]; -+ } -+ } -+ } else if ($random == 2) { -+ foreach ($words as $w) { -+ if ($w == $words[0] || $w == end($words)) { -+ $reduced .= $w; -+ } else { -+ $reduced .= $w[0]; -+ } -+ } -+ } else if ($random == 3) { -+ foreach ($words as $w) { -+ if ($w == $words[0] || $w == end($words)) { -+ $reduced .= $w; -+ } else { -+ $reduced .= $w[0].'.'; -+ } -+ } -+ } else if ($random == 4) { -+ foreach ($words as $w) { -+ if ($w == $words[0] || $w == end($words)) { -+ $reduced .= $w; -+ } else { -+ $reduced .= $w[0].'_'; -+ } -+ } -+ } -+ $random1 = rand(0, 4); -+ if ($random1 >= 1) { -+ $reduced = ucfirst($reduced); -+ } -+ $username = $reduced; -+ return $username; -+ } - } --- -2.7.4 -
View file
0010-No-version-information-can-be-obtained-using-git-use.patch
Added
@@ -0,0 +1,69 @@ +From 951d1328fd88417d3276427b71f24d7f5e1195d1 Mon Sep 17 00:00:00 2001 +From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com> +Date: Thu, 1 Dec 2016 13:15:06 +0100 +Subject: [PATCH 10/15] No version information can be obtained using git -- use + rpm. + +--- + .../PhabricatorConfigVersionController.php | 36 +++++++++++++--------- + 1 file changed, 22 insertions(+), 14 deletions(-) + +diff --git a/src/applications/config/controller/PhabricatorConfigVersionController.php b/src/applications/config/controller/PhabricatorConfigVersionController.php +index 15877dd..110de95 100644 +--- a/src/applications/config/controller/PhabricatorConfigVersionController.php ++++ b/src/applications/config/controller/PhabricatorConfigVersionController.php +@@ -62,6 +62,14 @@ final class PhabricatorConfigVersionController + 'phutil', + ); + ++ $pkg_specs = array( ++ 'phabricator' => 'phabricator', ++ 'arcanist' => 'arcanist', ++ 'phutil' => 'libphutil', ++ 'sprint' => 'phabricator-extension-sprint', ++ 'security' => 'phabricator-extension-security', ++ ); ++ + $all_libraries = PhutilBootloader::getInstance()->getAllLibraries(); + // This puts the core libraries at the top: + $other_libraries = array_diff($all_libraries, $specs); +@@ -69,22 +77,22 @@ final class PhabricatorConfigVersionController + + $futures = array(); + foreach ($specs as $lib) { +- $root = dirname(phutil_get_library_root($lib)); +- $futures[$lib] = +- id(new ExecFuture('git log --format=%s -n 1 --', '%H %ct')) +- ->setCWD($root); ++ if (array_key_exists($lib, $pkg_specs)) { ++ $lib = $pkg_specs[$lib]; ++ } ++ ++ $results[$lib] = ++ id(new ExecFuture("rpm --query --queryformat=%%{VERSION} $lib")); + } + +- $results = array(); +- foreach ($futures as $key => $future) { +- list($err, $stdout) = $future->resolve(); +- if (!$err) { +- list($hash, $epoch) = explode(' ', $stdout); +- $version = pht('%s (%s)', $hash, phabricator_date($epoch, $viewer)); +- } else { +- $version = pht('Unknown'); +- } +- $results[$key] = $version; ++ foreach ($results as $key => $future) { ++ list($ret, $version) = $future->resolve(); ++ ++ if ($ret > 0) { ++ $results[$key] = 'Unknown'; ++ } else { ++ $results[$key] = $version; ++ } + } + + return $results; +-- +2.9.3 +
View file
0011-Create-the-user-account-only-if-there-is-not-a-defau.patch
Deleted
@@ -1,73 +0,0 @@ -From a5641853097c3741609135cac39fc51b80f2f9fb Mon Sep 17 00:00:00 2001 -From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com> -Date: Tue, 4 Oct 2016 14:58:30 +0200 -Subject: [PATCH 11/16] Create the user account only if there is not a default - user account associated with the inbound email address - ---- - .../metamta/receiver/PhabricatorMailReceiver.php | 42 +++++++++++----------- - 1 file changed, 21 insertions(+), 21 deletions(-) - -diff --git a/src/applications/metamta/receiver/PhabricatorMailReceiver.php b/src/applications/metamta/receiver/PhabricatorMailReceiver.php -index 6fa0dba..0ec9a6c 100644 ---- a/src/applications/metamta/receiver/PhabricatorMailReceiver.php -+++ b/src/applications/metamta/receiver/PhabricatorMailReceiver.php -@@ -138,6 +138,27 @@ abstract class PhabricatorMailReceiver extends Phobject { - } - } - -+ if ($this->getApplicationEmail()) { -+ $application_email = $this->getApplicationEmail(); -+ $default_user_phid = $application_email->getConfigValue( -+ PhabricatorMetaMTAApplicationEmail::CONFIG_DEFAULT_AUTHOR); -+ -+ if ($default_user_phid) { -+ $user = id(new PhabricatorUser())->loadOneWhere( -+ 'phid = %s', -+ $default_user_phid); -+ if ($user) { -+ return $user; -+ } -+ } -+ -+ $reasons[] = pht( -+ "Phabricator is misconfigured, the application email ". -+ "'%s' is set to user '%s' but that user does not exist.", -+ $application_email->getAddress(), -+ $default_user_phid); -+ } -+ - // If we don't know who this user is, load or create an external user - // account for them if we're configured for it. - $email_key = 'phabricator.allow-email-users'; -@@ -185,27 +206,6 @@ abstract class PhabricatorMailReceiver extends Phobject { - $raw_from); - } - -- if ($this->getApplicationEmail()) { -- $application_email = $this->getApplicationEmail(); -- $default_user_phid = $application_email->getConfigValue( -- PhabricatorMetaMTAApplicationEmail::CONFIG_DEFAULT_AUTHOR); -- -- if ($default_user_phid) { -- $user = id(new PhabricatorUser())->loadOneWhere( -- 'phid = %s', -- $default_user_phid); -- if ($user) { -- return $user; -- } -- } -- -- $reasons[] = pht( -- "Phabricator is misconfigured, the application email ". -- "'%s' is set to user '%s' but that user does not exist.", -- $application_email->getAddress(), -- $default_user_phid); -- } -- - $reasons = implode("\n\n", $reasons); - - throw new PhabricatorMetaMTAReceivedMailProcessingException( --- -2.7.4 -
View file
0011-Create-user-account-on-inbound-email.patch
Added
@@ -0,0 +1,207 @@ +From 69f7bda38840dac3915f5577e9a393463c02bb9d Mon Sep 17 00:00:00 2001 +From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com> +Date: Wed, 10 Aug 2016 11:11:56 +0200 +Subject: [PATCH 11/15] Create user account on inbound email. + +This patch allows an inbound email to create a full, new user account. + +This way, Phabricator triggers the initial response ('Maniphest task created'), +and actual subsequent comments and changes to the Maniphest task are sent to the +author of the inbound email that created the ticket. + +Create the user account only if there is not a default user account associated with the inbound email address +--- + .../metamta/receiver/PhabricatorMailReceiver.php | 144 ++++++++++++++++----- + 1 file changed, 114 insertions(+), 30 deletions(-) + +diff --git a/src/applications/metamta/receiver/PhabricatorMailReceiver.php b/src/applications/metamta/receiver/PhabricatorMailReceiver.php +index 07d364b..0ec9a6c 100644 +--- a/src/applications/metamta/receiver/PhabricatorMailReceiver.php ++++ b/src/applications/metamta/receiver/PhabricatorMailReceiver.php +@@ -94,12 +94,14 @@ abstract class PhabricatorMailReceiver extends Phobject { + */ + public function loadSender(PhabricatorMetaMTAReceivedMail $mail) { + $raw_from = $mail->getHeader('From'); +- $from = self::getRawAddress($raw_from); ++ $from = id(new PhutilEmailAddress($raw_from)) ++ ->getAddress(); + + $reasons = array(); + + // Try to find a user with this email address. + $user = PhabricatorUser::loadOneWithEmailAddress($from); ++ + if ($user) { + return $user; + } else { +@@ -115,9 +117,11 @@ abstract class PhabricatorMailReceiver extends Phobject { + $reply_to_key = 'metamta.insecure-auth-with-reply-to'; + $allow_reply_to = PhabricatorEnv::getEnvConfig($reply_to_key); + if ($allow_reply_to) { +- $reply_to = self::getRawAddress($raw_reply_to); ++ $reply_to = id(new PhutilEmailAddress($raw_reply_to)) ++ ->getAddress(); + + $user = PhabricatorUser::loadOneWithEmailAddress($reply_to); ++ + if ($user) { + return $user; + } else { +@@ -134,34 +138,6 @@ abstract class PhabricatorMailReceiver extends Phobject { + } + } + +- // If we don't know who this user is, load or create an external user +- // account for them if we're configured for it. +- $email_key = 'phabricator.allow-email-users'; +- $allow_email_users = PhabricatorEnv::getEnvConfig($email_key); +- if ($allow_email_users) { +- $from_obj = new PhutilEmailAddress($from); +- $xuser = id(new PhabricatorExternalAccountQuery()) +- ->setViewer($this->getViewer()) +- ->withAccountTypes(array('email')) +- ->withAccountDomains(array($from_obj->getDomainName(), 'self')) +- ->withAccountIDs(array($from_obj->getAddress())) +- ->requireCapabilities( +- array( +- PhabricatorPolicyCapability::CAN_VIEW, +- PhabricatorPolicyCapability::CAN_EDIT, +- )) +- ->loadOneOrCreate(); +- return $xuser->getPhabricatorUser(); +- } else { +- $reasons[] = pht( +- 'Phabricator is also not configured to allow unknown external users '. +- 'to send mail to the system using just an email address.'); +- $reasons[] = pht( +- 'To interact with Phabricator, add this address ("%s") to your '. +- 'account.', +- $raw_from); +- } +- + if ($this->getApplicationEmail()) { + $application_email = $this->getApplicationEmail(); + $default_user_phid = $application_email->getConfigValue( +@@ -183,6 +159,53 @@ abstract class PhabricatorMailReceiver extends Phobject { + $default_user_phid); + } + ++ // If we don't know who this user is, load or create an external user ++ // account for them if we're configured for it. ++ $email_key = 'phabricator.allow-email-users'; ++ $allow_email_users = PhabricatorEnv::getEnvConfig($email_key); ++ ++ if ($allow_email_users) { ++ if (empty($raw_from) && !empty($raw_reply_to)) { ++ $raw_from = $raw_reply_to; ++ } ++ ++ $from = new PhutilEmailAddress($raw_from); ++ $email_address = $from->getAddress(); ++ $realname = $from->getDisplayName(); ++ ++ if (empty($realname)) { ++ $realname = $this->generateRealname(); ++ } ++ ++ $username = $this->generateUsername($realname); ++ ++ $admin = PhabricatorUser::getOmnipotentUser(); ++ $user = new PhabricatorUser(); ++ $user->setUsername($username); ++ $user->setRealname($realname); ++ $user->setIsApproved(1); ++ ++ $email_object = id(new PhabricatorUserEmail()) ++ ->setAddress($email_address) ++ ->setIsVerified(1); ++ ++ id(new PhabricatorUserEditor()) ++ ->setActor($admin) ++ ->createNewUser($user, $email_object); ++ ++ //$user->sendWelcomeEmail($admin); ++ ++ return $user; ++ } else { ++ $reasons[] = pht( ++ 'Phabricator is also not configured to allow unknown external users '. ++ 'to send mail to the system using just an email address.'); ++ $reasons[] = pht( ++ 'To interact with Phabricator, add this address ("%s") to your '. ++ 'account.', ++ $raw_from); ++ } ++ + $reasons = implode("\n\n", $reasons); + + throw new PhabricatorMetaMTAReceivedMailProcessingException( +@@ -268,4 +291,65 @@ abstract class PhabricatorMailReceiver extends Phobject { + return trim(phutil_utf8_strtolower($address)); + } + ++ protected function generateRealname() { ++ $realname_generator = new PhutilRealNameContextFreeGrammar(); ++ $random_real_name = $realname_generator->generate(); ++ return $random_real_name; ++ } ++ ++ protected function generateUsername($random_real_name) { ++ $name = strtolower($random_real_name); ++ $name = preg_replace('/[^a-z]/s' , ' ', $name); ++ $name = preg_replace('/\s+/', ' ', $name); ++ $words = explode(' ', $name); ++ $random = rand(0, 4); ++ $reduced = ''; ++ if ($random == 0) { ++ foreach ($words as $w) { ++ if ($w == end($words)) { ++ $reduced .= $w; ++ } else { ++ $reduced .= $w[0]; ++ } ++ } ++ } else if ($random == 1) { ++ foreach ($words as $w) { ++ if ($w == $words[0]) { ++ $reduced .= $w; ++ } else { ++ $reduced .= $w[0]; ++ } ++ } ++ } else if ($random == 2) { ++ foreach ($words as $w) { ++ if ($w == $words[0] || $w == end($words)) { ++ $reduced .= $w; ++ } else { ++ $reduced .= $w[0]; ++ } ++ } ++ } else if ($random == 3) { ++ foreach ($words as $w) { ++ if ($w == $words[0] || $w == end($words)) { ++ $reduced .= $w; ++ } else { ++ $reduced .= $w[0].'.'; ++ } ++ } ++ } else if ($random == 4) { ++ foreach ($words as $w) { ++ if ($w == $words[0] || $w == end($words)) { ++ $reduced .= $w; ++ } else { ++ $reduced .= $w[0].'_'; ++ } ++ } ++ } ++ $random1 = rand(0, 4); ++ if ($random1 >= 1) { ++ $reduced = ucfirst($reduced);
View file
0012-Do-not-require-top-replies-only.patch
Changed
@@ -1,7 +1,7 @@ -From b1aef7656d4876be311e16d1fe5bf6f782231cc5 Mon Sep 17 00:00:00 2001 +From 49539b01d98973d4c340c0ece79dd75117c836d2 Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com> Date: Wed, 10 Aug 2016 18:19:22 +0200 -Subject: [PATCH 12/16] Do not require top-replies only. +Subject: [PATCH 12/15] Do not require top-replies only. Phabricator's MetaMTA mail parser currently strips anything beyond a very selected set of magical markers. This doesn't work for inline comments nor bottom replies. --- @@ -21,5 +21,5 @@ // Look for "On <date>, <user> wrote:". This may be split across multiple // lines. We need to be careful not to remove all of a message like this: -- -2.7.4 +2.9.3
View file
0013-No-matching-commits-to-users-on-displayname.patch
Changed
@@ -1,7 +1,7 @@ -From 3cb4d831aca166cba7a885fbfe78a83ba1126fde Mon Sep 17 00:00:00 2001 +From 40759b4d5f33fc4d8737ec41845a3d54ced18f6b Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com> Date: Wed, 10 Aug 2016 18:27:51 +0200 -Subject: [PATCH 13/16] No matching commits to users on displayname +Subject: [PATCH 13/15] No matching commits to users on displayname Phabricator erroneously assumes that it operates in a vacuum, while in the real world, multiple people may carry a display name of Jack. @@ -49,5 +49,5 @@ } -- -2.7.4 +2.9.3
View file
0014-Allow-the-title-to-be-overriden.patch
Changed
@@ -1,11 +1,13 @@ -From 05a0dedce4586baa161de7eb98afe0f54b459b1a Mon Sep 17 00:00:00 2001 +From 5cb36291a97e44ae0768a8841c8c277eab5eaa5f Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com> Date: Tue, 23 Aug 2016 11:58:19 +0200 -Subject: [PATCH 14/16] Allow the title to be overriden +Subject: [PATCH 14/15] Allow the title to be overriden +Translate Phabricator in welcome emails --- src/applications/home/controller/PhabricatorHomeMainController.php | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + src/applications/people/storage/PhabricatorUser.php | 6 ++++-- + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/applications/home/controller/PhabricatorHomeMainController.php b/src/applications/home/controller/PhabricatorHomeMainController.php index 405959f..aebbfd9 100644 @@ -20,6 +22,32 @@ ->addClass('phabricator-home') ->appendChild($content); +diff --git a/src/applications/people/storage/PhabricatorUser.php b/src/applications/people/storage/PhabricatorUser.php +index bc102b7..d0ff45c 100644 +--- a/src/applications/people/storage/PhabricatorUser.php ++++ b/src/applications/people/storage/PhabricatorUser.php +@@ -704,17 +704,19 @@ final class PhabricatorUser + PhabricatorAuthSessionEngine::ONETIME_WELCOME); + + $body = pht( +- "Welcome to Phabricator!\n\n". ++ "Welcome to %s!\n\n". + "%s (%s) has created an account for you.\n\n". + " Username: %s\n\n". +- "To login to Phabricator, follow this link and set a password:\n\n". ++ "To login to %s, follow this link and set a password:\n\n". + " %s\n\n". + "After you have set a password, you can login in the future by ". + "going here:\n\n". + " %s\n", ++ pht('Phabricator'), + $admin_username, + $admin_realname, + $user_username, ++ pht('Phabricator'), + $uri, + $base_uri); + -- -2.7.4 +2.9.3
View file
0015-Revert-Removed-unused-buildApplicationPage-method-fr.patch
Added
@@ -0,0 +1,63 @@ +From 51700eefb429988b8b92592463204459fac11ddb Mon Sep 17 00:00:00 2001 +From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com> +Date: Thu, 8 Sep 2016 16:57:03 +0200 +Subject: [PATCH 15/15] Revert "Removed unused buildApplicationPage method from + PhabricatorController" + +This reverts commit 2201c65eb73fb99b8625bea45c273d262f2c289f. +--- + .../base/controller/PhabricatorController.php | 40 ++++++++++++++++++++++ + 1 file changed, 40 insertions(+) + +diff --git a/src/applications/base/controller/PhabricatorController.php b/src/applications/base/controller/PhabricatorController.php +index f2b267b..0cb8182 100644 +--- a/src/applications/base/controller/PhabricatorController.php ++++ b/src/applications/base/controller/PhabricatorController.php +@@ -575,4 +575,44 @@ abstract class PhabricatorController extends AphrontController { + return $page->produceAphrontResponse(); + } + ++ ++ /** ++ * DEPRECATED. Use @{method:newPage}. ++ */ ++ public function buildApplicationPage($view, array $options) { ++ $page = $this->newPage(); ++ ++ $title = PhabricatorEnv::getEnvConfig('phabricator.serious-business') ? ++ 'Phabricator' : ++ pht('Bacon Ice Cream for Breakfast'); ++ ++ $page->setTitle(idx($options, 'title', $title)); ++ ++ if (idx($options, 'class')) { ++ $page->addClass($options['class']); ++ } ++ ++ if (!($view instanceof AphrontSideNavFilterView)) { ++ $nav = new AphrontSideNavFilterView(); ++ $nav->appendChild($view); ++ $view = $nav; ++ } ++ ++ $page->appendChild($view); ++ ++ $object_phids = idx($options, 'pageObjects', array()); ++ if ($object_phids) { ++ $page->setPageObjectPHIDs($object_phids); ++ } ++ ++ if (!idx($options, 'device', true)) { ++ $page->setDeviceReady(false); ++ } ++ ++ $page->setShowFooter(idx($options, 'showFooter', true)); ++ $page->setShowChrome(idx($options, 'chrome', true)); ++ ++ return $page->produceAphrontResponse(); ++ } ++ + } +-- +2.9.3 +
View file
0015-Translate-Phabricator-in-welcome-emails.patch
Deleted
@@ -1,38 +0,0 @@ -From 9ed50b98bc33cf7123103206a3374128d94f1afd Mon Sep 17 00:00:00 2001 -From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com> -Date: Thu, 8 Sep 2016 13:53:45 +0200 -Subject: [PATCH 15/16] Translate Phabricator in welcome emails - ---- - src/applications/people/storage/PhabricatorUser.php | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/applications/people/storage/PhabricatorUser.php b/src/applications/people/storage/PhabricatorUser.php -index acbf477..7d1761e 100644 ---- a/src/applications/people/storage/PhabricatorUser.php -+++ b/src/applications/people/storage/PhabricatorUser.php -@@ -690,17 +690,19 @@ final class PhabricatorUser - PhabricatorAuthSessionEngine::ONETIME_WELCOME); - - $body = pht( -- "Welcome to Phabricator!\n\n". -+ "Welcome to %s!\n\n". - "%s (%s) has created an account for you.\n\n". - " Username: %s\n\n". -- "To login to Phabricator, follow this link and set a password:\n\n". -+ "To login to %s, follow this link and set a password:\n\n". - " %s\n\n". - "After you have set a password, you can login in the future by ". - "going here:\n\n". - " %s\n", -+ pht('Phabricator'), - $admin_username, - $admin_realname, - $user_username, -+ pht('Phabricator'), - $uri, - $base_uri); - --- -2.7.4 -
View file
0016-Revert-Removed-unused-buildApplicationPage-method-fr.patch
Deleted
@@ -1,63 +0,0 @@ -From d836210ed3ca314405062883ed15cfaea5003149 Mon Sep 17 00:00:00 2001 -From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com> -Date: Thu, 8 Sep 2016 16:57:03 +0200 -Subject: [PATCH 16/16] Revert "Removed unused buildApplicationPage method from - PhabricatorController" - -This reverts commit 2201c65eb73fb99b8625bea45c273d262f2c289f. ---- - .../base/controller/PhabricatorController.php | 40 ++++++++++++++++++++++ - 1 file changed, 40 insertions(+) - -diff --git a/src/applications/base/controller/PhabricatorController.php b/src/applications/base/controller/PhabricatorController.php -index f2b267b..0cb8182 100644 ---- a/src/applications/base/controller/PhabricatorController.php -+++ b/src/applications/base/controller/PhabricatorController.php -@@ -575,4 +575,44 @@ abstract class PhabricatorController extends AphrontController { - return $page->produceAphrontResponse(); - } - -+ -+ /** -+ * DEPRECATED. Use @{method:newPage}. -+ */ -+ public function buildApplicationPage($view, array $options) { -+ $page = $this->newPage(); -+ -+ $title = PhabricatorEnv::getEnvConfig('phabricator.serious-business') ? -+ 'Phabricator' : -+ pht('Bacon Ice Cream for Breakfast'); -+ -+ $page->setTitle(idx($options, 'title', $title)); -+ -+ if (idx($options, 'class')) { -+ $page->addClass($options['class']); -+ } -+ -+ if (!($view instanceof AphrontSideNavFilterView)) { -+ $nav = new AphrontSideNavFilterView(); -+ $nav->appendChild($view); -+ $view = $nav; -+ } -+ -+ $page->appendChild($view); -+ -+ $object_phids = idx($options, 'pageObjects', array()); -+ if ($object_phids) { -+ $page->setPageObjectPHIDs($object_phids); -+ } -+ -+ if (!idx($options, 'device', true)) { -+ $page->setDeviceReady(false); -+ } -+ -+ $page->setShowFooter(idx($options, 'showFooter', true)); -+ $page->setShowChrome(idx($options, 'chrome', true)); -+ -+ return $page->produceAphrontResponse(); -+ } -+ - } --- -2.7.4 -
View file
update.sh
Changed
@@ -53,8 +53,8 @@ commitepoch=$(git log HEAD^1..HEAD --oneline --format=%ct | head -n 1) commitdate=$(date +%Y%m%d --date @${commitepoch}) -month_behind=$(date +%Y%m%d --date @$(( ${commitepoch} - ( 31 * 24 * 3600 ) ))) -month_ahead=$(date +%Y%m%d --date @$(( ${commitepoch} + ( 31 * 24 * 3600 ) ))) +months_behind=$(date +%Y%m%d --date @$(( ${commitepoch} - ( 31 * 24 * 3600 * 3 ) ))) +months_ahead=$(date +%Y%m%d --date @$(( ${commitepoch} + ( 31 * 24 * 3600 * 3 ) ))) popd @@ -71,16 +71,16 @@ if [ "${package}" == "arcanist" ]; then sed -i -r \ - -e "s/Requires:(\s+)arcanist\(libphutil\) >= 0\.[0-9]+/Requires:\1arcanist\(libphutil\) >= 0\.${month_behind}/g" \ - -e "s/Requires:(\s+)arcanist\(libphutil\) <= 0\.[0-9]+/Requires:\1arcanist\(libphutil\) <= 0\.${month_ahead}/g" \ + -e "s/Requires:(\s+)arcanist\(libphutil\) >= 0\.[0-9]+/Requires:\1arcanist\(libphutil\) >= 0\.${months_behind}/g" \ + -e "s/Requires:(\s+)arcanist\(libphutil\) <= 0\.[0-9]+/Requires:\1arcanist\(libphutil\) <= 0\.${months_ahead}/g" \ ${package}.spec elif [ "${package}" == "phabricator" ]; then sed -i -r \ - -e "s/Requires:(\s+)arcanist >= 0\.[0-9]+/Requires:\1arcanist >= 0\.${month_behind}/g" \ - -e "s/Requires:(\s+)arcanist <= 0\.[0-9]+/Requires:\1arcanist <= 0\.${month_ahead}/g" \ - -e "s/Requires:(\s+)phabricator\(libphutil\) >= 0\.[0-9]+/Requires:\1phabricator\(libphutil\) >= 0\.${month_behind}/g" \ - -e "s/Requires:(\s+)phabricator\(libphutil\) <= 0\.[0-9]+/Requires:\1phabricator\(libphutil\) <= 0\.${month_ahead}/g" \ + -e "s/Requires:(\s+)arcanist >= 0\.[0-9]+/Requires:\1arcanist >= 0\.${months_behind}/g" \ + -e "s/Requires:(\s+)arcanist <= 0\.[0-9]+/Requires:\1arcanist <= 0\.${months_ahead}/g" \ + -e "s/Requires:(\s+)phabricator\(libphutil\) >= 0\.[0-9]+/Requires:\1phabricator\(libphutil\) >= 0\.${months_behind}/g" \ + -e "s/Requires:(\s+)phabricator\(libphutil\) <= 0\.[0-9]+/Requires:\1phabricator\(libphutil\) <= 0\.${months_ahead}/g" \ ${package}.spec fi
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.