[00:01:11] Ah K ;) [00:01:57] awight: yep [00:02:36] awight: I pushed a bunch of patches to sync deployment with the repo version [00:02:56] & in theory if they are merged then running the script will leave the repo clean [00:03:18] feel free to self-merge anything that's just cherry-picking already reviewed patches, btw [00:06:19] Fundraising Sprint X-Ray Spex, Fundraising-Backlog, MediaWiki-extensions-DonationInterface, Unplanned-Sprint-Work, FR-GlobalCollect: Determine what was breaking GlobalCollect in paymentswiki 3730cff20 - https://phabricator.wikimedia.org/T118349#1804945 (AndyRussG) [00:06:21] Fundraising Sprint Snoop (Dogg|Lion), Fundraising Sprint Tom Waits, Fundraising Sprint UB40, Fundraising Sprint Vengaboys, and 4 others: Associate banner history ID with contribution_tracking ID - https://phabricator.wikimedia.org/T112022#1804944 (AndyRussG) [00:06:37] eileen: got this from a submodule: [00:06:37] fatal: reference is not a tree: c0b53f091c2512282815b439c7e60812bce56e41 [00:06:41] Unable to checkout 'c0b53f091c2512282815b439c7e60812bce56e41' in submodule path 'packages' [00:07:06] awight: :-( I wonder if my packages is merged ahead [00:07:42] (CR) Eileen: [C: 2 V: 2] "Trying to force merge this" [wikimedia/fundraising/civicrm-packages] (civi-4.6.9) - https://gerrit.wikimedia.org/r/248261 (owner: Eileen) [00:07:59] awight: I just attempted a force-merge https://gerrit.wikimedia.org/r/#/c/248261/ [00:08:35] (CR) Eileen: [C: 2] "Merge this -" [wikimedia/fundraising/civicrm-drupal] (civi-4.6.9) - https://gerrit.wikimedia.org/r/248260 (owner: Eileen) [00:08:46] (CR) Eileen: [V: 2] "Merge this -" [wikimedia/fundraising/civicrm-drupal] (civi-4.6.9) - https://gerrit.wikimedia.org/r/248260 (owner: Eileen) [00:09:01] So - hopefully the submodules are OK now [00:09:17] awight: do you remember why https://phabricator.wikimedia.org/T108741 is a blocking task on the BHID task? [00:09:25] (CR) Eileen: [V: 2] add test for contact.merge action [wikimedia/fundraising/civicrm-core] - https://gerrit.wikimedia.org/r/252481 (https://phabricator.wikimedia.org/T115426) (owner: Eileen) [00:10:19] (CR) Eileen: [C: 2 V: 2] "Force merge - this is just a repo sync" [wikimedia/fundraising/civicrm-core] - https://gerrit.wikimedia.org/r/252473 (owner: Eileen) [00:10:26] AndyRussG: I think that was when we were thinking about storing BH info directly in the contribution_tracking table, from donatewiki and paymentswiki. U can unlink the tasks, agreed [00:10:46] awight: K will do [00:10:48] (CR) Eileen: [C: 2 V: 2] "Force merge - this is just a repo sync" [wikimedia/fundraising/civicrm-core] - https://gerrit.wikimedia.org/r/252472 (owner: Eileen) [00:11:22] Fundraising-Backlog: Zendesk account for AWight - https://phabricator.wikimedia.org/T118611#1804950 (atgo) I think we should discuss this more with @mbeat33 and @ppena. There may be a cost/seat (not sure) but also it may be better to collaborate with our wonderful donor services agents in real time :) [00:11:27] (CR) Eileen: [C: 2 V: 2] "Force merge - this is just a repo sync" [wikimedia/fundraising/civicrm-core] - https://gerrit.wikimedia.org/r/252471 (owner: Eileen) [00:11:55] (CR) Eileen: [C: 2 V: 2] "Force merge - this is just a repo sync" [wikimedia/fundraising/civicrm-core] - https://gerrit.wikimedia.org/r/252470 (owner: Eileen) [00:12:13] Fundraising Tech Backlog, Fundraising-Backlog, MediaWiki-extensions-ContributionTracking: SPIKE: Check status of ContributionTracking code on donate wiki landing page - https://phabricator.wikimedia.org/T108741#1804953 (AndyRussG) [00:12:15] Fundraising Sprint Snoop (Dogg|Lion), Fundraising Sprint Tom Waits, Fundraising Sprint UB40, Fundraising Sprint Vengaboys, and 4 others: Associate banner history ID with contribution_tracking ID - https://phabricator.wikimedia.org/T112022#1804952 (AndyRussG) [00:12:17] (CR) Eileen: [C: 2 V: 2] "Force merge - this is just a repo sync" [wikimedia/fundraising/civicrm-core] - https://gerrit.wikimedia.org/r/252469 (https://phabricator.wikimedia.org/T117044) (owner: Eileen) [00:12:19] (CR) Awight: Add script for compiling deployment repo (6 comments) [wikimedia/fundraising/civicrm-core] - https://gerrit.wikimedia.org/r/252376 (https://phabricator.wikimedia.org/T1152925) (owner: Eileen) [00:13:06] (CR) Eileen: [C: 2 V: 2] "Force merge - this is just a repo sync" [wikimedia/fundraising/civicrm-core] - https://gerrit.wikimedia.org/r/252468 (owner: Eileen) [00:13:49] (CR) Eileen: [C: 2 V: 2] "Force merge - this is just a repo sync" [wikimedia/fundraising/civicrm-core] - https://gerrit.wikimedia.org/r/252467 (https://phabricator.wikimedia.org/T116420) (owner: Eileen) [00:14:13] (CR) Eileen: [C: 2 V: 2] "Force merge - this is just a repo sync" [wikimedia/fundraising/civicrm-core] - https://gerrit.wikimedia.org/r/252466 (https://phabricator.wikimedia.org/T117172) (owner: Eileen) [00:14:15] eileen: Not sure what the plan is with git branches in the new civicrm-* repos? I see that civi-4.6.9 has spread there, but I don't understand what would make that any different from master? [00:14:58] awight: so, I think we would have a branch per CiviCRM release for the civi-fork-repos [00:15:21] (so we can do the rebase thing each point release) [00:15:35] (CR) Eileen: [C: 2 V: 2] "Force merge - this is just a repo sync" [wikimedia/fundraising/civicrm-core] - https://gerrit.wikimedia.org/r/252465 (owner: Eileen) [00:16:03] (CR) Eileen: [C: 2 V: 2] "Force merge - this is just a repo sync" [wikimedia/fundraising/civicrm-core] - https://gerrit.wikimedia.org/r/252464 (owner: Eileen) [00:17:06] (CR) Eileen: "Force merge - this is just a repo sync" [wikimedia/fundraising/civicrm-core] - https://gerrit.wikimedia.org/r/252464 (owner: Eileen) [00:17:33] (CR) Eileen: [C: 2 V: 2] "Force merge - this is just a repo sync" [wikimedia/fundraising/civicrm-core] - https://gerrit.wikimedia.org/r/252463 (https://phabricator.wikimedia.org/T117492) (owner: Eileen) [00:17:43] (CR) Awight: Add script for compiling deployment repo (3 comments) [wikimedia/fundraising/civicrm-core] - https://gerrit.wikimedia.org/r/252376 (https://phabricator.wikimedia.org/T1152925) (owner: Eileen) [00:17:49] eileen: ok! [00:18:19] (CR) Eileen: [C: 2 V: 2] "Force merge - this is just a repo sync" [wikimedia/fundraising/civicrm-core] - https://gerrit.wikimedia.org/r/252375 (https://phabricator.wikimedia.org/T115925) (owner: Eileen) [00:19:07] (CR) Eileen: [C: 2 V: 2] "Force merge - this is just a repo sync" [wikimedia/fundraising/civicrm-core] - https://gerrit.wikimedia.org/r/252482 (owner: Eileen) [00:19:27] (CR) Awight: Add script for compiling deployment repo (1 comment) [wikimedia/fundraising/civicrm-core] - https://gerrit.wikimedia.org/r/252376 (https://phabricator.wikimedia.org/T1152925) (owner: Eileen) [00:19:29] (CR) Eileen: "Force merge - this is just a repo sync" [wikimedia/fundraising/civicrm-core] - https://gerrit.wikimedia.org/r/252481 (https://phabricator.wikimedia.org/T115426) (owner: Eileen) [00:19:45] (CR) Eileen: [C: 2 V: 2] "Force merge - this is just a repo sync" [wikimedia/fundraising/civicrm-core] - https://gerrit.wikimedia.org/r/252480 (owner: Eileen) [00:20:36] (CR) Eileen: [C: 2 V: 2] "Force merge - this is just a repo sync" [wikimedia/fundraising/civicrm-core] - https://gerrit.wikimedia.org/r/252479 (owner: Eileen) [00:20:53] (CR) Eileen: [C: 2 V: 2] "Force merge - this is just a repo sync" [wikimedia/fundraising/civicrm-core] - https://gerrit.wikimedia.org/r/252478 (owner: Eileen) [00:21:10] (CR) Eileen: [C: 2 V: 2] "Force merge - this is just a repo sync" [wikimedia/fundraising/civicrm-core] - https://gerrit.wikimedia.org/r/252477 (https://phabricator.wikimedia.org/T99836) (owner: Eileen) [00:21:37] (CR) Eileen: [C: 2 V: 2] "Force merge - this is just a repo sync" [wikimedia/fundraising/civicrm-core] - https://gerrit.wikimedia.org/r/252476 (https://phabricator.wikimedia.org/T99837) (owner: Eileen) [00:21:42] (CR) Awight: Add script for compiling deployment repo (3 comments) [wikimedia/fundraising/civicrm-core] - https://gerrit.wikimedia.org/r/252376 (https://phabricator.wikimedia.org/T1152925) (owner: Eileen) [00:21:55] (CR) Eileen: [C: 2 V: 2] "Force merge - this is just a repo sync" [wikimedia/fundraising/civicrm-core] - https://gerrit.wikimedia.org/r/252475 (https://phabricator.wikimedia.org/T99842) (owner: Eileen) [00:22:10] (CR) Eileen: [C: 2 V: 2] "Force merge - this is just a repo sync" [wikimedia/fundraising/civicrm-core] - https://gerrit.wikimedia.org/r/252474 (owner: Eileen) [00:23:04] (CR) Awight: Add script for compiling deployment repo (1 comment) [wikimedia/fundraising/civicrm-core] - https://gerrit.wikimedia.org/r/252376 (https://phabricator.wikimedia.org/T1152925) (owner: Eileen) [00:27:10] (CR) Awight: Add script for compiling deployment repo (1 comment) [wikimedia/fundraising/civicrm-core] - https://gerrit.wikimedia.org/r/252376 (https://phabricator.wikimedia.org/T1152925) (owner: Eileen) [00:32:20] (CR) Eileen: Add script for compiling deployment repo (6 comments) [wikimedia/fundraising/civicrm-core] - https://gerrit.wikimedia.org/r/252376 (https://phabricator.wikimedia.org/T1152925) (owner: Eileen) [00:33:12] (CR) Awight: [C: -1] "It's very close! The biggest issue IMO is that when things go wrong, I can't run a second time cos the deployment directory has uncommitt" (1 comment) [wikimedia/fundraising/civicrm-core] - https://gerrit.wikimedia.org/r/252376 (https://phabricator.wikimedia.org/T1152925) (owner: Eileen) [00:33:47] eileen: I found some things. Would it be helpful to talk? [00:34:47] (CR) Awight: "This broke for me:" [wikimedia/fundraising/civicrm-core] - https://gerrit.wikimedia.org/r/252376 (https://phabricator.wikimedia.org/T1152925) (owner: Eileen) [00:35:19] awight: ok - let me just get a little caffeine & find a good possie [00:35:50] * awight fears the posse is up to no good [00:36:07] position... [00:36:37] * awight becomes noticeably less worried about bandits [00:39:07] ok am on hangouts [00:42:46] eileen: No luck so far [00:58:18] (CR) Awight: "Maybe include the 'composer install' script" [wikimedia/fundraising/civicrm-core] - https://gerrit.wikimedia.org/r/252376 (https://phabricator.wikimedia.org/T1152925) (owner: Eileen) [01:03:07] Fundraising Sprint Tom Waits, Fundraising Sprint UB40, Fundraising Sprint Vengaboys, Fundraising Sprint William Shatner, and 5 others: Fix banners on IE8 and IE9 - https://phabricator.wikimedia.org/T113013#1805180 (AndyRussG) Open>Resolved [01:06:02] Fundraising Sprint Tom Waits, Fundraising Sprint UB40, Fundraising Sprint Vengaboys, Fundraising Sprint William Shatner, and 5 others: Fix banners on IE8 and IE9 - https://phabricator.wikimedia.org/T113013#1805181 (AndyRussG) Marked "Resolved" rather than "Declined" since it appears likely that w... [01:11:58] Back a bit later...! Good weekend to all, if I don't see you!! :) [01:45:17] (CR) Awight: [C: 2] "Yes!" [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/252965 (https://phabricator.wikimedia.org/T118216) (owner: Eileen) [01:45:35] (Abandoned) Eileen: Permit (and ingore) comma in amount data entry [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/252144 (https://phabricator.wikimedia.org/T118216) (owner: Eileen) [01:47:33] (Merged) jenkins-bot: Remove check for currency in validate hook on the basis CiviCRM handles this [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/252965 (https://phabricator.wikimedia.org/T118216) (owner: Eileen) [12:19:05] Fundraising-Backlog, MediaWiki-extensions-DonationInterface, Easy: Quotation marks are low on Jimmy quote - https://phabricator.wikimedia.org/T94049#1805546 (Haritha28) I couldn't find out in which file the particular change has to be made. It would be nice if someone could help me . Thanks!