[00:07:07] 10Fundraising Sprint Cheese String Theory, 10Fundraising-Backlog, 10Wikimedia-Fundraising-CiviCRM, 10fundraising Sprint Black Hole Fillings, 10FR-Email: Link mailing data to contacts imported from RML - https://phabricator.wikimedia.org/T222854 (10Eileenmcnaughton) select contact_identifier, mailing_iden... [00:27:13] 10Fundraising Sprint Cheese String Theory, 10Fundraising-Backlog, 10Wikimedia-Fundraising-CiviCRM, 10fundraising Sprint Black Hole Fillings, 10FR-Email: Link mailing data to contacts imported from RML - https://phabricator.wikimedia.org/T222854 (10Ejegg) So the work I was assuming this involved is actual... [00:40:24] eileen: odd - that RML contact whose Civi record was created on Jan 1 2022 has the RML signup date of Dec 7th, 2021, but most of the Acoustic folks with that signup date have Civi records created on Dec 7th or 8th [00:40:55] so I guess some stray Acoustic users aren't coming back in the groupmember query till a long time after their RML [00:56:26] 10Fundraising Sprint Cheese String Theory, 10Fundraising-Backlog, 10Wikimedia-Fundraising-CiviCRM, 10fundraising Sprint Black Hole Fillings, 10FR-Email: Link mailing data to contacts imported from RML - https://phabricator.wikimedia.org/T222854 (10Ejegg) Fortunately, it looks like the great majority of A... [00:57:25] So that job is going to update data for a really small proportion of RML contacts, like 1-2 in 1000 [01:10:38] ejegg: it's also possible the job gets turned off or lags a lot at times [01:11:10] hmm, could be [02:23:30] 10Fundraising Sprint Cheese String Theory, 10Fundraising-Backlog, 10Wikimedia-Fundraising-CiviCRM, 10fundraising Sprint Black Hole Fillings, 10FR-Email: Link mailing data to contacts imported from RML - https://phabricator.wikimedia.org/T222854 (10Eileenmcnaughton) NOTE resolvable from 0 = 268k rows & to... [02:25:14] (03PS1) 10Eileen: Stock civicrm 5.47-beta [wikimedia/fundraising/crm/civicrm] - 10https://gerrit.wikimedia.org/r/762972 (https://phabricator.wikimedia.org/T294487) [02:28:08] (03CR) 10jerkins-bot: [V: 04-1] Stock civicrm 5.47-beta [wikimedia/fundraising/crm/civicrm] - 10https://gerrit.wikimedia.org/r/762972 (https://phabricator.wikimedia.org/T294487) (owner: 10Eileen) [03:08:35] (03PS1) 10Eileen: Update extendedreports [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/762973 (https://phabricator.wikimedia.org/T294487) [04:22:20] (03PS1) 10Eileen: Wip [wikimedia/fundraising/crm/civicrm] - 10https://gerrit.wikimedia.org/r/762975 [04:22:22] (03PS1) 10Eileen: Re-add WMF code to support our templates [wikimedia/fundraising/crm/civicrm] - 10https://gerrit.wikimedia.org/r/762976 [04:22:24] (03PS1) 10Eileen: Fixes for language in preview [wikimedia/fundraising/crm/civicrm] - 10https://gerrit.wikimedia.org/r/762977 [04:22:26] (03PS1) 10Eileen: Fix still being upstreamed [wikimedia/fundraising/crm/civicrm] - 10https://gerrit.wikimedia.org/r/762978 [04:25:04] (03CR) 10jerkins-bot: [V: 04-1] Fixes for language in preview [wikimedia/fundraising/crm/civicrm] - 10https://gerrit.wikimedia.org/r/762977 (owner: 10Eileen) [04:25:22] (03CR) 10jerkins-bot: [V: 04-1] Fix still being upstreamed [wikimedia/fundraising/crm/civicrm] - 10https://gerrit.wikimedia.org/r/762978 (owner: 10Eileen) [04:25:27] (03CR) 10jerkins-bot: [V: 04-1] Wip [wikimedia/fundraising/crm/civicrm] - 10https://gerrit.wikimedia.org/r/762975 (owner: 10Eileen) [04:25:29] (03CR) 10jerkins-bot: [V: 04-1] Re-add WMF code to support our templates [wikimedia/fundraising/crm/civicrm] - 10https://gerrit.wikimedia.org/r/762976 (owner: 10Eileen) [07:15:14] (03CR) 10jerkins-bot: [V: 04-1] Localisation updates from https://translatewiki.net. [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/763127 (owner: 10L10n-bot) [07:33:39] (03CR) 10Raimond Spekking: [C: 03+2] "false positive" [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/763127 (owner: 10L10n-bot) [11:43:56] 10Fundraising Sprint Cheese String Theory, 10Fundraising-Backlog, 10FR-Email: Implement the new footer for email preference center - https://phabricator.wikimedia.org/T301728 (10Damilare) a:03Damilare [11:51:03] 10Fundraising Sprint Cheese String Theory, 10Fundraising-Backlog, 10donate.wikimedia.org, 10Wikimedia-production-error: PHP Warning: geoip_country_code_by_name(): Required database not available at /usr/share/GeoIP/GeoIP.dat. - https://phabricator.wikimedia.org/T301485 (10Pcoombe) @Ejegg I don't know anyth... [15:53:31] hi fr-tech XenoRyet AndyRussG [16:07:23] hi damilare fr-tech! :) [16:51:30] 10Fundraising Sprint Cheese String Theory, 10Fundraising-Backlog, 10FR-Email: Email Pref. Ctr.: Copy translations from wikimediafoundation.org and put links in qqq.json - https://phabricator.wikimedia.org/T301815 (10DStrine) p:05Triage→03High [16:51:37] 10Fundraising Sprint Cheese String Theory, 10Fundraising-Backlog, 10FR-form-chooser-refactor: break out form chooser tasks - https://phabricator.wikimedia.org/T301799 (10DStrine) p:05Triage→03Medium [16:51:46] 10Fundraising Sprint Cheese String Theory, 10Fundraising-Backlog, 10Wikimedia-Fundraising-CiviCRM, 10FR-Email: Civi Searchkit should allow user to export list to acoustic - https://phabricator.wikimedia.org/T301514 (10DStrine) p:05Triage→03Medium [16:51:48] (03PS1) 10Wfan: WIP: Switch civicrm country to civicrm countries [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/763274 (https://phabricator.wikimedia.org/T301493) [16:51:58] 10Fundraising Sprint Cheese String Theory, 10Fundraising-Backlog, 10Fr-planning-ahead, 10FR-Email: create a preference center link available in civi on contact record - https://phabricator.wikimedia.org/T301289 (10DStrine) p:05Triage→03High [16:52:04] 10Fundraising Sprint Cheese String Theory, 10Fundraising-Backlog, 10FR-Adyen, 10FR-payments-general, 10MW-1.38-notes (1.38.0-wmf.22; 2022-02-14): Enable Monthy Convert for Bundle Countries and Sweden - https://phabricator.wikimedia.org/T300920 (10DStrine) p:05Triage→03Medium [16:52:21] 10Fundraising Sprint Cheese String Theory, 10Fundraising-Backlog, 10Wikimedia-Fundraising-CiviCRM, 10Recurring-Donations: Schedule recurring charge job more frequently - https://phabricator.wikimedia.org/T292278 (10DStrine) p:05Triage→03High [16:52:27] 10Fundraising Sprint Cheese String Theory, 10Fundraising-Backlog, 10FR-Braintree-Integration, 10FR-Paypal: Dust off braintree docs and break down tasks - https://phabricator.wikimedia.org/T291573 (10DStrine) p:05Triage→03Medium [16:52:36] 10Fundraising Sprint Cheese String Theory, 10Fundraising-Backlog, 10FR-Email: Implement the new footer for email preference center - https://phabricator.wikimedia.org/T301728 (10DStrine) p:05Triage→03High [16:52:49] 10Fundraising Sprint Cheese String Theory, 10Fundraising Sprint Princess Mongodb, 10Fundraising Sprint Technical debt house of horrors, 10Fundraising-Backlog, and 7 others: Email preference center's country list (from mediaWiki) has more countries than civi accepte... - https://phabricator.wikimedia.org/T301493 [16:52:59] 10Fundraising Sprint Cheese String Theory, 10Fundraising Sprint Princess Mongodb, 10Fundraising-Backlog, 10fundraising Sprint Black Hole Fillings, and 2 others: Email preference center: Display name, email and make the email address editable - https://phabricator.wikimedia.org/T299962 (10DStrine) p:05Tri... [16:53:10] 10Fundraising Sprint Cheese String Theory, 10Fundraising Sprint Princess Mongodb, 10Fundraising Sprint Technical debt house of horrors, 10Fundraising-Backlog, and 7 others: Email preference center: create new address type "Email Preference Country" - https://phabricator.wikimedia.org/T280674 (10DStrine) p:... [16:53:54] (03CR) 10jerkins-bot: [V: 04-1] WIP: Switch civicrm country to civicrm countries [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/763274 (https://phabricator.wikimedia.org/T301493) (owner: 10Wfan) [16:56:19] (03PS2) 10Wfan: WIP: Switch civicrm country to civicrm countries [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/763274 (https://phabricator.wikimedia.org/T301493) [17:00:22] hi fr-tech! [17:14:11] (03CR) 10Ejegg: "This works, but maybe we could use the fully translated country list from MediaWiki, and just filter by ISO codes listed in the settings?" [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/763274 (https://phabricator.wikimedia.org/T301493) (owner: 10Wfan) [17:15:38] (03CR) 10Ejegg: WIP: Switch civicrm country to civicrm countries (031 comment) [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/763274 (https://phabricator.wikimedia.org/T301493) (owner: 10Wfan) [17:17:24] (03CR) 10Wfan: "recheck" [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/763274 (https://phabricator.wikimedia.org/T301493) (owner: 10Wfan) [17:26:26] 10Fundraising-Backlog, 10fundraising-tech-ops: Issue new SSL Client Certificate for avargas - https://phabricator.wikimedia.org/T301702 (10Dwisehaupt) Certificate renewed and sent via email. Password sent via SMS. [17:55:01] 10Fundraising-Backlog, 10fundraising-tech-ops: Issue new SSL Client Certificate for ehughes - https://phabricator.wikimedia.org/T301423 (10Dwisehaupt) SSL certificate renewed and sent via email. Password sent via SMS. [18:07:39] (03PS7) 10Wfan: Add extra address type for email preference country [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/761106 (https://phabricator.wikimedia.org/T280674) [18:15:07] (03PS2) 10Wfan: WIP: Email Preference Email Edit [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/762494 (https://phabricator.wikimedia.org/T299962) [18:15:35] (03PS3) 10Wfan: Email Preference Email Edit [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/762494 (https://phabricator.wikimedia.org/T299962) [18:16:33] (03PS4) 10Wfan: Email Preference Email Edit (civi part) [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/762501 (https://phabricator.wikimedia.org/T299962) [18:19:16] (03PS4) 10Wfan: Email Preference Email Edit [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/762494 (https://phabricator.wikimedia.org/T299962) [18:19:18] (03CR) 10jerkins-bot: [V: 04-1] Email Preference Email Edit [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/762494 (https://phabricator.wikimedia.org/T299962) (owner: 10Wfan) [19:00:00] 10Fundraising-Backlog: modernize DjangoBannerStats to python3 - https://phabricator.wikimedia.org/T301905 (10Jgreen) [19:00:56] 10Fundraising-Backlog: modernize DjangoBannerStats to python3 - https://phabricator.wikimedia.org/T301905 (10Jgreen) [19:00:59] 10fundraising-tech-ops, 10Patch-For-Review: encrypt fundraising database client->server communication - https://phabricator.wikimedia.org/T170321 (10Jgreen) [19:12:10] PROBLEM - check_log_messages on frav1002 is CRITICAL: CRITICAL: GlobalCollect_endpoint_critical 1 [=1] https://icinga.wikimedia.org/cgi-bin/icinga/extinfo.cgi?type=2&host=frav1002&service=check_log_messages [19:14:17] 10Fundraising-Backlog, 10FR-Email: EPIC: Exploring other ESPs even if it’s just to get new workflow/feature ideas - https://phabricator.wikimedia.org/T301906 (10DStrine) [19:17:10] PROBLEM - check_log_messages on frav1002 is CRITICAL: CRITICAL: GlobalCollect_endpoint_critical 1 [=1] https://icinga.wikimedia.org/cgi-bin/icinga/extinfo.cgi?type=2&host=frav1002&service=check_log_messages [19:22:08] 10Fundraising-Backlog, 10Wikimedia-Fundraising-CiviCRM, 10FR-Email: Do we need to export from acoustic to civi so many times per day? - https://phabricator.wikimedia.org/T301517 (10DStrine) We discussed this internally with fr-tech. This isn't broken or costing us anything. If it becomes an issue, this task... [19:22:10] PROBLEM - check_log_messages on frav1002 is CRITICAL: CRITICAL: GlobalCollect_endpoint_critical 1 [=1] https://icinga.wikimedia.org/cgi-bin/icinga/extinfo.cgi?type=2&host=frav1002&service=check_log_messages [19:24:18] 10Fundraising-Backlog, 10FR-Email: Stop exporting undeliverable email addresses to Acoustic (i.e. donor1@my@email.com) - https://phabricator.wikimedia.org/T301907 (10DStrine) [19:32:10] PROBLEM - check_log_messages on frav1002 is CRITICAL: CRITICAL: GlobalCollect_endpoint_critical 1 [=1],GlobalCollect_endpoint_warning 1 [=1] https://icinga.wikimedia.org/cgi-bin/icinga/extinfo.cgi?type=2&host=frav1002&service=check_log_messages [19:35:38] this globalcollect enpoint check is only failing on codfw hosts and not consistently. not a major concern right now. [19:37:10] RECOVERY - check_log_messages on frav1002 is OK: OK https://icinga.wikimedia.org/cgi-bin/icinga/extinfo.cgi?type=2&host=frav1002&service=check_log_messages [19:52:10] PROBLEM - check_log_messages on frav1002 is CRITICAL: CRITICAL: GlobalCollect_endpoint_critical 2 [=1],GlobalCollect_endpoint_warning 1 [=1] https://icinga.wikimedia.org/cgi-bin/icinga/extinfo.cgi?type=2&host=frav1002&service=check_log_messages [19:57:10] PROBLEM - check_log_messages on frav1002 is CRITICAL: CRITICAL: GlobalCollect_endpoint_critical 1 [=1],GlobalCollect_endpoint_warning 1 [=1] https://icinga.wikimedia.org/cgi-bin/icinga/extinfo.cgi?type=2&host=frav1002&service=check_log_messages [19:59:35] 10Fundraising Sprint Cheese String Theory: Email preference center's language list (from mediaWiki and filter by json file) has different format than civi accepted now - https://phabricator.wikimedia.org/T301911 (10AnnWF) [20:02:10] PROBLEM - check_log_messages on frav1002 is CRITICAL: CRITICAL: GlobalCollect_endpoint_critical 1 [=1],GlobalCollect_endpoint_warning 1 [=1] https://icinga.wikimedia.org/cgi-bin/icinga/extinfo.cgi?type=2&host=frav1002&service=check_log_messages [20:07:10] PROBLEM - check_log_messages on frav1002 is CRITICAL: CRITICAL: GlobalCollect_endpoint_critical 1 [=1] https://icinga.wikimedia.org/cgi-bin/icinga/extinfo.cgi?type=2&host=frav1002&service=check_log_messages [20:12:10] RECOVERY - check_log_messages on frav1002 is OK: OK https://icinga.wikimedia.org/cgi-bin/icinga/extinfo.cgi?type=2&host=frav1002&service=check_log_messages [20:27:42] 10Fundraising-Backlog, 10Python3-Porting: modernize DjangoBannerStats to python3 - https://phabricator.wikimedia.org/T301905 (10Peachey88) [20:31:09] (03CR) 10Ejegg: "Suggestions inline for getting the country code back" [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/762501 (https://phabricator.wikimedia.org/T299962) (owner: 10Wfan) [20:50:02] Any chance I can get a +2 on this - I want to see if my other tests start passing.... https://gerrit.wikimedia.org/r/c/wikimedia/fundraising/crm/+/762973 [21:05:38] I can but I did not know how to test this haha. [21:06:24] Should I just plus 2, is this what you asking for. eileen: ? [21:08:59] wfan personally I think this one is safe enough - but you should never feel pressured to +2 something you are not sure about [21:09:44] we actually are moving away from extended reports but it creates additional reports in https://wmff.localhost:32353/civicrm/admin/report/template/list?reset=1 [21:10:49] (03CR) 10Wfan: [C: 03+2] Update extendedreports [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/762973 (https://phabricator.wikimedia.org/T294487) (owner: 10Eileen) [21:10:57] thanks! [21:11:04] np :) [21:21:48] (03Merged) 10jenkins-bot: Update extendedreports [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/762973 (https://phabricator.wikimedia.org/T294487) (owner: 10Eileen) [21:44:05] (03CR) 10Eileen: "recheck" [wikimedia/fundraising/crm/civicrm] - 10https://gerrit.wikimedia.org/r/762972 (https://phabricator.wikimedia.org/T294487) (owner: 10Eileen) [21:59:36] (03PS2) 10Eileen: Re-add WMF code to support our templates [wikimedia/fundraising/crm/civicrm] - 10https://gerrit.wikimedia.org/r/762976 [21:59:38] (03PS1) 10Eileen: Re-add settings_location.php [wikimedia/fundraising/crm/civicrm] - 10https://gerrit.wikimedia.org/r/763346 (https://phabricator.wikimedia.org/T268495) [21:59:58] (03Abandoned) 10Eileen: Wip [wikimedia/fundraising/crm/civicrm] - 10https://gerrit.wikimedia.org/r/762975 (owner: 10Eileen) [22:00:21] (03Abandoned) 10Eileen: Fix still being upstreamed [wikimedia/fundraising/crm/civicrm] - 10https://gerrit.wikimedia.org/r/762978 (owner: 10Eileen) [22:00:37] (03Abandoned) 10Eileen: Fixes for language in preview [wikimedia/fundraising/crm/civicrm] - 10https://gerrit.wikimedia.org/r/762977 (owner: 10Eileen) [22:04:14] (03CR) 10Eileen: Add extra address type for email preference country (031 comment) [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/761106 (https://phabricator.wikimedia.org/T280674) (owner: 10Wfan) [22:06:00] (03PS8) 10Wfan: Add extra address type for email preference country [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/761106 (https://phabricator.wikimedia.org/T280674) [22:06:29] (03CR) 10Wfan: Add extra address type for email preference country (031 comment) [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/761106 (https://phabricator.wikimedia.org/T280674) (owner: 10Wfan) [22:11:06] (03CR) 10jerkins-bot: [V: 04-1] Re-add settings_location.php [wikimedia/fundraising/crm/civicrm] - 10https://gerrit.wikimedia.org/r/763346 (https://phabricator.wikimedia.org/T268495) (owner: 10Eileen) [22:11:22] (03CR) 10jerkins-bot: [V: 04-1] Re-add WMF code to support our templates [wikimedia/fundraising/crm/civicrm] - 10https://gerrit.wikimedia.org/r/762976 (owner: 10Eileen) [22:17:22] (03CR) 10jerkins-bot: [V: 04-1] Add extra address type for email preference country [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/761106 (https://phabricator.wikimedia.org/T280674) (owner: 10Wfan) [22:17:53] (03PS2) 10Eileen: Re-add settings_location.php [wikimedia/fundraising/crm/civicrm] - 10https://gerrit.wikimedia.org/r/763346 (https://phabricator.wikimedia.org/T268495) [22:17:55] (03PS3) 10Eileen: Re-add WMF code to support our templates [wikimedia/fundraising/crm/civicrm] - 10https://gerrit.wikimedia.org/r/762976 [22:19:07] (03PS9) 10Wfan: Add extra address type for email preference country [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/761106 (https://phabricator.wikimedia.org/T280674) [22:21:04] (03CR) 10Eileen: Add extra address type for email preference country (031 comment) [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/761106 (https://phabricator.wikimedia.org/T280674) (owner: 10Wfan) [22:22:05] (03CR) 10Eileen: Add extra address type for email preference country (031 comment) [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/761106 (https://phabricator.wikimedia.org/T280674) (owner: 10Wfan) [22:24:37] (03CR) 10Wfan: Add extra address type for email preference country (031 comment) [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/761106 (https://phabricator.wikimedia.org/T280674) (owner: 10Wfan) [22:28:24] (03CR) 10jerkins-bot: [V: 04-1] Re-add settings_location.php [wikimedia/fundraising/crm/civicrm] - 10https://gerrit.wikimedia.org/r/763346 (https://phabricator.wikimedia.org/T268495) (owner: 10Eileen) [22:29:08] (03CR) 10jerkins-bot: [V: 04-1] Re-add WMF code to support our templates [wikimedia/fundraising/crm/civicrm] - 10https://gerrit.wikimedia.org/r/762976 (owner: 10Eileen) [22:36:42] wfan: that patch I was looking at needs to be merged AFTER other stuff is done - is that right? [22:39:16] the country one? [22:39:48] eileen: the editable email one I am working on, need to be merged after the address type merged [22:40:37] wfan: so this one https://gerrit.wikimedia.org/r/c/wikimedia/fundraising/crm/+/761106 - makes a valid country mandatory - but it also adds an address type [22:41:25] adding the address type = easy & safe - but I'm worried the country strictness out of order could be an issue [22:42:29] So will you suggest to have the country ticket merge before this address type merge? [22:59:30] (03CR) 10Ejegg: "I think we don't need to use the new location type for email, just for address." [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/762501 (https://phabricator.wikimedia.org/T299962) (owner: 10Wfan) [23:01:17] ejegg: so we will update email for any type which is currently set as primary right? [23:04:12] yes wfan, I think that's the expected behavior [23:04:51] and in the unlikely event that the donor has no email we create a new one - I think in that case we don't specify a location type and civi just picks the default [23:05:25] Ok, and we assume all the contact has email? If not, what type should I create for the email? Home? [23:05:41] Ha, just saw your comment [23:06:03] you just answered my question haha, thanks! [23:06:07] cool cool [23:07:41] 10Fundraising Sprint Cheese String Theory, 10Fundraising-Backlog, 10Fr-planning-ahead, 10FR-Email: create a preference center link available in civi on contact record - https://phabricator.wikimedia.org/T301289 (10Ejegg) a:03Ejegg [23:11:40] (03PS1) 10Ejegg: Add settings for pref ctr link in CiviCRM [wikimedia/fundraising/dev] - 10https://gerrit.wikimedia.org/r/763361 (https://phabricator.wikimedia.org/T301289) [23:18:21] dang, my local wmff git metadata got completely borked [23:18:42] I think I had most of the local branches up in gerrit [23:33:11] wfan I wonder if it would be simpler for us to just merge the .mgd update first - just to separate interactions [23:33:32] sounds good to me, want me to update that now? [23:35:25] Then can I move the country part with the country option ticket, or I should create another ticket just for fix the country update? [23:35:34] elieen: [23:35:40] eileen: [23:36:52] wfan: I don't think you need a new ticket - just it means if there are separate commits then we can merge the location type one [23:38:27] eileen: oh ok, then I will remove the other two files first, and once the address type merged, then I will have another commit for the same ticket number [23:40:51] (03PS10) 10Wfan: Add extra address type for email preference country [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/761106 (https://phabricator.wikimedia.org/T280674) [23:41:44] eileen: updated