Katie Horn has submitted this change and it was merged. Change subject: Refactor extensions out of common module ......................................................................
Refactor extensions out of common module Deployment: * Stop everything * drush rr * drush cc all * Restart stuff Change-Id: I3e2156c735b58e6b90464e91ec458406da62e6b7 --- R sites/all/modules/wmf_civicrm/WmfTransaction.php R sites/all/modules/wmf_civicrm/bootstrap.inc R sites/all/modules/wmf_civicrm/civicrm_api_check.inc R sites/all/modules/wmf_civicrm/db_switcher.inc R sites/all/modules/wmf_civicrm/recurring.inc R sites/all/modules/wmf_civicrm/scripts/find_refunds.drush.inc R sites/all/modules/wmf_civicrm/scripts/resettle.drush.inc R sites/all/modules/wmf_civicrm/tests/Refund.test R sites/all/modules/wmf_civicrm/tracking.inc R sites/all/modules/wmf_civicrm/wmf_civicrm.info R sites/all/modules/wmf_civicrm/wmf_civicrm.install R sites/all/modules/wmf_civicrm/wmf_civicrm.module M sites/all/modules/wmf_common/wmf_common.info R sites/all/modules/wmf_communication/Job.php R sites/all/modules/wmf_communication/Mailer.php R sites/all/modules/wmf_communication/MailingTemplate.php R sites/all/modules/wmf_communication/Recipient.php R sites/all/modules/wmf_communication/Templating.php R sites/all/modules/wmf_communication/Translation.php R sites/all/modules/wmf_communication/tests/Job.test R sites/all/modules/wmf_communication/tests/TestThankyouTemplate.php R sites/all/modules/wmf_communication/tests/templates/html/thank_you.it.html R sites/all/modules/wmf_communication/tests/templates/subject/thank_you.it.subject R sites/all/modules/wmf_communication/tests/templates/txt/thank_you.it.txt R sites/all/modules/wmf_communication/tests/wmf_communication_tests.info R sites/all/modules/wmf_communication/tests/wmf_communication_tests.module R sites/all/modules/wmf_communication/wmf_communication.drush.inc R sites/all/modules/wmf_communication/wmf_communication.info R sites/all/modules/wmf_communication/wmf_communication.install R sites/all/modules/wmf_communication/wmf_communication.module R sites/all/modules/wmf_logging/wmf_logging.info R sites/all/modules/wmf_logging/wmf_logging.module 32 files changed, 1 insertion(+), 1 deletion(-) Approvals: Katie Horn: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/sites/all/modules/wmf_common/WmfTransaction.php b/sites/all/modules/wmf_civicrm/WmfTransaction.php similarity index 100% rename from sites/all/modules/wmf_common/WmfTransaction.php rename to sites/all/modules/wmf_civicrm/WmfTransaction.php diff --git a/sites/all/modules/wmf_common/wmf_civicrm/bootstrap.inc b/sites/all/modules/wmf_civicrm/bootstrap.inc similarity index 100% rename from sites/all/modules/wmf_common/wmf_civicrm/bootstrap.inc rename to sites/all/modules/wmf_civicrm/bootstrap.inc diff --git a/sites/all/modules/wmf_common/wmf_civicrm/civicrm_api_check.inc b/sites/all/modules/wmf_civicrm/civicrm_api_check.inc similarity index 100% rename from sites/all/modules/wmf_common/wmf_civicrm/civicrm_api_check.inc rename to sites/all/modules/wmf_civicrm/civicrm_api_check.inc diff --git a/sites/all/modules/wmf_common/wmf_civicrm/db_switcher.inc b/sites/all/modules/wmf_civicrm/db_switcher.inc similarity index 100% rename from sites/all/modules/wmf_common/wmf_civicrm/db_switcher.inc rename to sites/all/modules/wmf_civicrm/db_switcher.inc diff --git a/sites/all/modules/wmf_common/wmf_civicrm/recurring.inc b/sites/all/modules/wmf_civicrm/recurring.inc similarity index 100% rename from sites/all/modules/wmf_common/wmf_civicrm/recurring.inc rename to sites/all/modules/wmf_civicrm/recurring.inc diff --git a/sites/all/modules/wmf_common/wmf_civicrm/scripts/find_refunds.drush.inc b/sites/all/modules/wmf_civicrm/scripts/find_refunds.drush.inc similarity index 100% rename from sites/all/modules/wmf_common/wmf_civicrm/scripts/find_refunds.drush.inc rename to sites/all/modules/wmf_civicrm/scripts/find_refunds.drush.inc diff --git a/sites/all/modules/wmf_common/wmf_civicrm/scripts/resettle.drush.inc b/sites/all/modules/wmf_civicrm/scripts/resettle.drush.inc similarity index 100% rename from sites/all/modules/wmf_common/wmf_civicrm/scripts/resettle.drush.inc rename to sites/all/modules/wmf_civicrm/scripts/resettle.drush.inc diff --git a/sites/all/modules/wmf_common/wmf_civicrm/tests/Refund.test b/sites/all/modules/wmf_civicrm/tests/Refund.test similarity index 100% rename from sites/all/modules/wmf_common/wmf_civicrm/tests/Refund.test rename to sites/all/modules/wmf_civicrm/tests/Refund.test diff --git a/sites/all/modules/wmf_common/wmf_civicrm/tracking.inc b/sites/all/modules/wmf_civicrm/tracking.inc similarity index 100% rename from sites/all/modules/wmf_common/wmf_civicrm/tracking.inc rename to sites/all/modules/wmf_civicrm/tracking.inc diff --git a/sites/all/modules/wmf_common/wmf_civicrm/wmf_civicrm.info b/sites/all/modules/wmf_civicrm/wmf_civicrm.info similarity index 90% rename from sites/all/modules/wmf_common/wmf_civicrm/wmf_civicrm.info rename to sites/all/modules/wmf_civicrm/wmf_civicrm.info index 1009fee..338dee3 100644 --- a/sites/all/modules/wmf_common/wmf_civicrm/wmf_civicrm.info +++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.info @@ -7,4 +7,5 @@ dependencies[] = contribution_tracking dependencies[] = wmf_common files[] = db_switcher.inc +files[] = WmfTransaction.php files[] = tests/Refund.test diff --git a/sites/all/modules/wmf_common/wmf_civicrm/wmf_civicrm.install b/sites/all/modules/wmf_civicrm/wmf_civicrm.install similarity index 100% rename from sites/all/modules/wmf_common/wmf_civicrm/wmf_civicrm.install rename to sites/all/modules/wmf_civicrm/wmf_civicrm.install diff --git a/sites/all/modules/wmf_common/wmf_civicrm/wmf_civicrm.module b/sites/all/modules/wmf_civicrm/wmf_civicrm.module similarity index 100% rename from sites/all/modules/wmf_common/wmf_civicrm/wmf_civicrm.module rename to sites/all/modules/wmf_civicrm/wmf_civicrm.module diff --git a/sites/all/modules/wmf_common/wmf_common.info b/sites/all/modules/wmf_common/wmf_common.info index a3bb7dc..1eae588 100755 --- a/sites/all/modules/wmf_common/wmf_common.info +++ b/sites/all/modules/wmf_common/wmf_common.info @@ -5,6 +5,5 @@ configure = admin/config/wmf_common files[] = Queue.php files[] = WmfException.php -files[] = WmfTransaction.php files[] = twigext_l10n/CldrData.php files[] = twigext_l10n/TwigLocalization.php diff --git a/sites/all/modules/wmf_common/wmf_communication/Job.php b/sites/all/modules/wmf_communication/Job.php similarity index 100% rename from sites/all/modules/wmf_common/wmf_communication/Job.php rename to sites/all/modules/wmf_communication/Job.php diff --git a/sites/all/modules/wmf_common/wmf_communication/Mailer.php b/sites/all/modules/wmf_communication/Mailer.php similarity index 100% rename from sites/all/modules/wmf_common/wmf_communication/Mailer.php rename to sites/all/modules/wmf_communication/Mailer.php diff --git a/sites/all/modules/wmf_common/wmf_communication/MailingTemplate.php b/sites/all/modules/wmf_communication/MailingTemplate.php similarity index 100% rename from sites/all/modules/wmf_common/wmf_communication/MailingTemplate.php rename to sites/all/modules/wmf_communication/MailingTemplate.php diff --git a/sites/all/modules/wmf_common/wmf_communication/Recipient.php b/sites/all/modules/wmf_communication/Recipient.php similarity index 100% rename from sites/all/modules/wmf_common/wmf_communication/Recipient.php rename to sites/all/modules/wmf_communication/Recipient.php diff --git a/sites/all/modules/wmf_common/wmf_communication/Templating.php b/sites/all/modules/wmf_communication/Templating.php similarity index 100% rename from sites/all/modules/wmf_common/wmf_communication/Templating.php rename to sites/all/modules/wmf_communication/Templating.php diff --git a/sites/all/modules/wmf_common/wmf_communication/Translation.php b/sites/all/modules/wmf_communication/Translation.php similarity index 100% rename from sites/all/modules/wmf_common/wmf_communication/Translation.php rename to sites/all/modules/wmf_communication/Translation.php diff --git a/sites/all/modules/wmf_common/wmf_communication/tests/Job.test b/sites/all/modules/wmf_communication/tests/Job.test similarity index 100% rename from sites/all/modules/wmf_common/wmf_communication/tests/Job.test rename to sites/all/modules/wmf_communication/tests/Job.test diff --git a/sites/all/modules/wmf_common/wmf_communication/tests/TestThankyouTemplate.php b/sites/all/modules/wmf_communication/tests/TestThankyouTemplate.php similarity index 100% rename from sites/all/modules/wmf_common/wmf_communication/tests/TestThankyouTemplate.php rename to sites/all/modules/wmf_communication/tests/TestThankyouTemplate.php diff --git a/sites/all/modules/wmf_common/wmf_communication/tests/templates/html/thank_you.it.html b/sites/all/modules/wmf_communication/tests/templates/html/thank_you.it.html similarity index 100% rename from sites/all/modules/wmf_common/wmf_communication/tests/templates/html/thank_you.it.html rename to sites/all/modules/wmf_communication/tests/templates/html/thank_you.it.html diff --git a/sites/all/modules/wmf_common/wmf_communication/tests/templates/subject/thank_you.it.subject b/sites/all/modules/wmf_communication/tests/templates/subject/thank_you.it.subject similarity index 100% rename from sites/all/modules/wmf_common/wmf_communication/tests/templates/subject/thank_you.it.subject rename to sites/all/modules/wmf_communication/tests/templates/subject/thank_you.it.subject diff --git a/sites/all/modules/wmf_common/wmf_communication/tests/templates/txt/thank_you.it.txt b/sites/all/modules/wmf_communication/tests/templates/txt/thank_you.it.txt similarity index 100% rename from sites/all/modules/wmf_common/wmf_communication/tests/templates/txt/thank_you.it.txt rename to sites/all/modules/wmf_communication/tests/templates/txt/thank_you.it.txt diff --git a/sites/all/modules/wmf_common/wmf_communication/tests/wmf_communication_tests.info b/sites/all/modules/wmf_communication/tests/wmf_communication_tests.info similarity index 100% rename from sites/all/modules/wmf_common/wmf_communication/tests/wmf_communication_tests.info rename to sites/all/modules/wmf_communication/tests/wmf_communication_tests.info diff --git a/sites/all/modules/wmf_common/wmf_communication/tests/wmf_communication_tests.module b/sites/all/modules/wmf_communication/tests/wmf_communication_tests.module similarity index 100% rename from sites/all/modules/wmf_common/wmf_communication/tests/wmf_communication_tests.module rename to sites/all/modules/wmf_communication/tests/wmf_communication_tests.module diff --git a/sites/all/modules/wmf_common/wmf_communication/wmf_communication.drush.inc b/sites/all/modules/wmf_communication/wmf_communication.drush.inc similarity index 100% rename from sites/all/modules/wmf_common/wmf_communication/wmf_communication.drush.inc rename to sites/all/modules/wmf_communication/wmf_communication.drush.inc diff --git a/sites/all/modules/wmf_common/wmf_communication/wmf_communication.info b/sites/all/modules/wmf_communication/wmf_communication.info similarity index 100% rename from sites/all/modules/wmf_common/wmf_communication/wmf_communication.info rename to sites/all/modules/wmf_communication/wmf_communication.info diff --git a/sites/all/modules/wmf_common/wmf_communication/wmf_communication.install b/sites/all/modules/wmf_communication/wmf_communication.install similarity index 100% rename from sites/all/modules/wmf_common/wmf_communication/wmf_communication.install rename to sites/all/modules/wmf_communication/wmf_communication.install diff --git a/sites/all/modules/wmf_common/wmf_communication/wmf_communication.module b/sites/all/modules/wmf_communication/wmf_communication.module similarity index 100% rename from sites/all/modules/wmf_common/wmf_communication/wmf_communication.module rename to sites/all/modules/wmf_communication/wmf_communication.module diff --git a/sites/all/modules/wmf_common/wmf_logging/wmf_logging.info b/sites/all/modules/wmf_logging/wmf_logging.info similarity index 100% rename from sites/all/modules/wmf_common/wmf_logging/wmf_logging.info rename to sites/all/modules/wmf_logging/wmf_logging.info diff --git a/sites/all/modules/wmf_common/wmf_logging/wmf_logging.module b/sites/all/modules/wmf_logging/wmf_logging.module similarity index 100% rename from sites/all/modules/wmf_common/wmf_logging/wmf_logging.module rename to sites/all/modules/wmf_logging/wmf_logging.module -- To view, visit https://gerrit.wikimedia.org/r/106454 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3e2156c735b58e6b90464e91ec458406da62e6b7 Gerrit-PatchSet: 2 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: master Gerrit-Owner: Adamw <[email protected]> Gerrit-Reviewer: Katie Horn <[email protected]> Gerrit-Reviewer: Mwalker <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
