[00:07:20] K4-713: feel like CR? I'm developing a case of schizo feature branches :-/ [00:07:47] I... haven't heard that word in so long. [00:08:03] haha, I'm trying to guess which word. "developing"? :p [00:08:14] High five [00:08:26] oh, sorry, we're late for a meeting nvm [00:08:30] wat [00:08:39] x (crossed fingers) [00:09:04] oh, ha. Not me. [00:09:09] Have a nice meeting. [00:09:25] >_> [00:09:26] <_< [00:09:55] Woah. [00:09:55] I guess I can merge locally and continue, but... that doesn't usually end well! [00:10:39] I just found a best practices document for fr-tech coders that never ascended to anything beyond plan text on my local. [00:10:56] wow [00:11:07] (PS5) Ssmith: Library and Profile styles and flow [wikimedia/fundraising/dash] - https://gerrit.wikimedia.org/r/188674 [00:11:10] make rm --scrub will take care of that [00:11:20] we can't make this job look too easy :p [00:11:56] Can we give off the impression that it will drive you to madness? [00:12:14] (CR) jenkins-bot: [V: -1] Library and Profile styles and flow [wikimedia/fundraising/dash] - https://gerrit.wikimedia.org/r/188674 (owner: Ssmith) [00:12:26] I can't imagine many eyebrows going up at that rumor [00:12:38] "oh, the drone in sector 7-G is malfunctioning again" [00:12:49] :) [00:13:24] I... lost count of the number of jobs I held for multiple years, that started out with somebody telling me "but you can't do this for more than three months, or you will go nuts" [00:14:10] I think I've been stating something like that very explicitly on my "own goals" [00:14:36] Now I've gone so nuts, I've extended the warranty. [00:16:36] (PS1) Awight: DO NOT MERGE: octopus for development. [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/189629 [00:17:19] Those last three lines are amazing together. [00:17:35] * K4-713 starts trying to hire an octopus [00:18:19] Look, the numbers for octopi that make it in software engineering, are frankly dismal. [00:18:24] Or just an ordinary underwater typist [00:19:13] http://thefreethoughtproject.com/bureau-labor-statistics-released-top-10-dangerous-jobs-report-police-officer/ weird, that was rebranded from earlier reporting [00:21:18] (PS3) Awight: WIP doPayment() [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/189153 [00:21:31] (CR) jenkins-bot: [V: -1] WIP doPayment() [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/189153 (owner: Awight) [00:28:40] (PS6) Ssmith: Library and Profile styles and flow [wikimedia/fundraising/dash] - https://gerrit.wikimedia.org/r/188674 [00:29:14] This JD is just... ugh. [00:30:15] Who talked who into this? [00:30:59] who talked you into writing the bait to talk foo's into applying? [00:31:15] * awight stares at apostrophe [00:31:19] hrm [00:32:16] I... don't really know that one either. [00:32:23] But it happened a long time ago. [00:32:36] * K4-713 stares into the distance [00:32:54] Wanna trade? [00:32:54] I thought the last one was good, that snared ejegg|away [00:32:57] d'oh [00:33:04] (apostrophe intended, this time) [00:33:15] sorry, I'm busy with some really fun coding stuff [00:33:22] * K4-713 blinks [00:33:27] I LOVE IT [00:33:28] :p [00:33:32] I thought you were training the octopus. [00:33:38] hehhe [00:33:56] the octopus is teaching me how to change colors [00:34:28] ahh, the radio became good. [00:40:42] "The idea of joining a small team with the goal of gaining useful tactical and strategic information to implement technical improvements to our campaigns excites you ." [00:40:47] I just threw up a little. [00:41:10] This is in what we used for ejegg|away, by the way. [00:41:12] So... [00:41:38] * K4-713 coughs [00:41:42] Who talks like that? [00:42:02] Might as well just say "WE ARE ROBOTS, JOIN ROBOTS." [00:42:11] Actually, that might work better. [00:42:28] err, maybe the nepotism is what worked for him, then [00:42:41] I'd prefer to think he didn't actually read it. [00:42:44] please do not say any of that sentence? [00:43:19] I *don't even know where that came from*. [00:43:34] Must have been one of those group effort things. [00:43:48] "Help save Wikipedia from advertising for toupees on late night TV" [00:43:52] Sometimes I think we'd be better off getting a ouija board. [00:44:07] "Keep us off the streets" [00:44:09] hrm [00:44:30] I think we should try that process again, via an offsite. [00:44:47] I'm hella locking down the people with edit rights, too. [00:44:56] :) [00:45:11] Whatever we did to get to "The idea of joining a small team with the goal of gaining useful tactical and strategic information to implement technical improvements to our campaigns excites you" must be stopped. [00:45:15] I'm fine with submitting spoon and knife requests :( [00:45:25] I'm excited to stop that kind of language [00:45:31] is @atgo still in the office? [00:45:35] yes [00:45:36] CaitVirtue: yep [00:45:38] Yes. [00:45:38] hehehe [00:45:42] k, thx [00:45:43] I speak for the trees [00:45:51] hey there loraz [00:45:53] lorax [00:45:55] :() [00:45:59] awight: That line makes it sound like we drive tanks. [00:46:07] CaitVirtue: u gotta see the "trueax"... [00:46:27] wait there's going to be tanks?! can I drive one ;-) [00:46:36] Only in your spare time. [00:46:41] it's literally published by a lumber cartel [00:46:48] http://woodfloors.org/truax.pdf [00:46:57] Contrary to the impression we give off, there is no tank driving in our job descriptions. [00:47:27] :-( [00:47:50] but not for toooo long, CaitVirtue [00:47:55] what's up? [00:48:02] dang. that was harssh :P [00:48:10] CHONK [00:48:22] I miss that sound. [01:07:24] (PS4) Awight: WIP doPayment() [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/189153 [01:07:46] (CR) jenkins-bot: [V: -1] WIP doPayment() [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/189153 (owner: Awight) [08:11:30] https://meta.wikimedia.org/wiki/Talk:CentralNotice#Global_dismissing [14:25:38] Hi AndyRussG [14:25:47] ejegg: Hi! [14:26:06] I'm trying to prepare these silly patches but they're being silly... Uh, that is not merging the way I'd like :/ [14:26:33] ooh, that's no fun. Whick are you trying to merge first? [14:26:38] *which [14:26:53] I'm still on merging master into wmf_deploy [14:27:05] ok [14:27:24] I can't seem to get it to merge in a way that just blindly pulls all the changes from master into wmf_deploy [14:28:28] For some reason, "git merge --strategy-option theirs master" didn't do it [14:31:48] ejegg: maybe I just need to resolve manually [14:32:11] hmm [14:32:44] Trying that... [14:35:42] are you conflicts all in tests? [14:36:10] The QUnit tests failing is what clued me in to something amiss.. [14:37:05] But also important lines in bannerController came out conflicted [14:37:24] I think maybe this is a situation Adam wanted to try to avoid, hope we're not stuck with it 4evarrrrrr [14:39:59] rrrg still QUnit failure... [14:42:30] ejegg: this is BS. There's no point in trying in this time slot if we're this far away :( Let's cancel for now, and go carefully, what do you think? [14:43:08] I thought I'd have time to get all the patches ready this morning but git got gnarly [14:43:10] ok, sounds like the safe thing to do [14:43:31] K. Thanks and apologies!!!! I'll update the Deplouments page to remove our slot [14:43:43] Do you still want to help me figure out how to do the merge properly? [14:43:56] K. I'll keep looking at the merge [14:44:05] K me too! [14:44:06] can't figure out why it wouldn't work [14:44:43] you get some i18n files conflicted too, right? [14:46:32] Yeah! [14:47:25] There must be a way to create an exact merge with the contents of the other branch [14:47:53] Or maybe there isn't, since that's not considered a "correct" concept of merging? [14:52:40] ejegg: we know master is good since its browser tests are clean (except the one that we know always fails): https://integration.wikimedia.org/ci/view/BrowserTests/view/CentralNotice/ [14:54:18] oh, crud, it's the revert on wmf_deploy that's messing us up, isn't it [14:55:48] so we want to revert the revert first, maybe? [14:58:38] ejegg: Hmmmm... interesting... That sounds reasonable, but I'm curious to understand how you're sure about that? [14:58:57] * AndyRussG yearns for complete understanding rather tham muddling, hah [14:59:06] because when I git log HEAD..master, it only lists 8 commits [14:59:21] (i.e. wmf_deploy..master) [14:59:39] even though wmf_deploy is back where it was on Dec 11 [14:59:50] OK, that seemed to work. [15:00:11] (PS1) Ejegg: Revert "Revert "Merge branch 'master' into wmf_deploy"" [extensions/CentralNotice] (wmf_deploy) - https://gerrit.wikimedia.org/r/189732 [15:00:13] (PS1) Ejegg: Merge branch 'master' into wmf_deploy [extensions/CentralNotice] (wmf_deploy) - https://gerrit.wikimedia.org/r/189733 [15:00:31] Want to try those out locally? [15:02:06] ejegg: OK... Yeah I see. [15:02:29] Indeed the previous revert didn't actually change history, it just undid the changes, but as a new commit, which is what we have to do [15:03:19] right [15:03:30] "revert revert" does sound fishy, but I guess sometimes you gotta do what you gotta do [15:04:06] I'll try these and then try doing the merge of master on top of them, locally [15:04:08] yeah, can't go back to the good state any other way [15:04:20] oh, the master merge is 733 [15:04:28] Huh? [15:04:53] https://gerrit.wikimedia.org/r/189733 is the merge of master into the restored wmf_deploy [15:05:14] no need for any further merging [15:09:21] yeah, git diff wmf_deploy..master now only shows .gitreview and one newline at the end of a file [15:09:39] Ah OK [15:09:50] I thought 733 was some special code, heh [15:12:43] ejegg: OK yes I get the same diff [15:12:55] I wonder if there's a way to get rid of that newline difference [15:13:16] i wouldn't worry about it [15:13:20] I saw a "patience" merge option that was supposed to take longer but potentially be cleaner w/ whitespace [15:13:33] i mean, you can do another commit just in wmf_deploy if you want [15:13:41] that just fixes that newline [15:14:09] I dunno....... mmm [15:14:38] I think we only want really simple merges, reverts or cherry-picks happening in directly wmf_deploy [15:14:53] Sorry to nit-pick, really appreaciate the help here BTW [15:15:28] Also curisous about the why of the new-line ;) [15:15:48] ehh, not worth worrying aboubt imo [15:16:06] still planning to not deploy now? [15:16:33] ejegg: yeah, let's still wait, sorry and thanks again [15:17:30] ok. i'm gonna nap a bit - had coffee yesterday for the first time in months and kept waking up all night! [15:17:38] cya later [15:18:21] ejegg|away: OK thanks again!! [17:14:23] (PS1) AndyRussG: Revert newline added in past merge [extensions/CentralNotice] (wmf_deploy) - https://gerrit.wikimedia.org/r/189756 [17:19:59] (PS2) AndyRussG: Merge branch 'master' into wmf_deploy [extensions/CentralNotice] (wmf_deploy) - https://gerrit.wikimedia.org/r/189733 (owner: Ejegg) [17:24:18] (CR) AndyRussG: [C: 1] "Cool, thanks!! More info on this git approach in such circumstances:" [extensions/CentralNotice] (wmf_deploy) - https://gerrit.wikimedia.org/r/189732 (owner: Ejegg) [17:35:22] (CR) AndyRussG: "Rebased to include additional nitpicky revert on wmf_deploy" [extensions/CentralNotice] (wmf_deploy) - https://gerrit.wikimedia.org/r/189733 (owner: Ejegg) [17:57:33] Hey, good morning, channel! [18:13:28] Good morning, voiced channel nickname owner [18:14:29] Yo. :) [18:17:23] ;p [19:26:58] AndyRussG: Not sure that means much, mwalker is still +f here [19:27:23] Hi marktraceur [19:27:36] :) [19:27:46] +f? You mean, he has +2 powerz? [19:28:07] He's a co-founder, I think. [19:28:24] Ah hmm [19:28:25] Oh, no, modification of access lists [19:28:35] Hmmm [19:29:33] marktraceur: Sorry to be so ignorantly confused, so you're saying we need to take away his powers, I guess? That would make sense... [19:29:41] Probably :) [19:29:51] Or just give everyone the same powers in the channel [19:30:12] Ah channel powerz right [19:30:46] That sounds like a job for our voiced channel nickname owner, maybe? [19:31:04] Heh, perhaps [19:31:05] (K4-713 ^ ?) [19:31:23] * K4-713 jumps [19:32:10] K4-713: marktraceur just brought up about mwalker's lingering channel powerz [19:32:23] Yeah, I just got there. [19:32:23] is all [19:32:39] Can I fix that? [19:32:52] I have no idea... maybe? [19:33:09] * K4-713 pokes around for chanserv info [19:42:14] * K4-713 looks sad [19:42:42] * K4-713 looks for other people to kill [19:59:14] Hmmm K4-713 might write a blog or something about the history of FR-tech one day, methinks [20:04:17] Oh man. [20:04:22] I want to help. [20:04:38] I have a lot of it, just... in my head. [20:04:54] Right next to the documentation for DonationInterface. [20:12:47] Hmm [20:32:34] hey - just wondering - is anyone from wikimedia going to CiviCon in Denver? [20:35:34] Hi eileen! I haven't heard of any plans to attend [20:39:02] ok - we are weighing up going [21:00:18] (PS5) Ejegg: Move some logging functions into DonationLogger [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/189584 [21:08:36] (CR) Ejegg: [C: 2] Revert newline added in past merge [extensions/CentralNotice] (wmf_deploy) - https://gerrit.wikimedia.org/r/189756 (owner: AndyRussG) [21:20:30] eileen: some of our team is talking about going, but not from the tech side [21:30:16] (CR) Ejegg: [C: -1] "A couple places use the current value of observables instead of the observables themselves." (2 comments) [wikimedia/fundraising/dash] - https://gerrit.wikimedia.org/r/188674 (owner: Ssmith) [22:08:05] (PS1) Ssmith: Save configuration for fraud gauge. [wikimedia/fundraising/dash] - https://gerrit.wikimedia.org/r/189840 [22:08:37] (CR) jenkins-bot: [V: -1] Save configuration for fraud gauge. [wikimedia/fundraising/dash] - https://gerrit.wikimedia.org/r/189840 (owner: Ssmith) [22:13:55] (CR) AndyRussG: [C: 2] Revert "Revert "Merge branch 'master' into wmf_deploy"" [extensions/CentralNotice] (wmf_deploy) - https://gerrit.wikimedia.org/r/189732 (owner: Ejegg) [22:15:09] (Merged) jenkins-bot: Revert "Revert "Merge branch 'master' into wmf_deploy"" [extensions/CentralNotice] (wmf_deploy) - https://gerrit.wikimedia.org/r/189732 (owner: Ejegg) [22:16:54] AndyRussG: want to try deploying? [22:17:39] ejegg: any time is fine... :) but it can also definitely wait for you to get better :) [22:18:48] Would 15 minutes from now be OK? Just grabbing some eats [22:20:25] ejegg: sure! That'd still give us a free 1hr 1/2 block, I see [22:20:49] sounds good [22:21:03] ejegg: K... thanks! I'll grab the slot [22:24:42] Wikimedia-Fundraising: Explore a membership program - https://phabricator.wikimedia.org/T85830#1029284 (atgo) [22:35:54] ejegg! you're vertical! [22:36:01] pizzzacat: Hey, do you have a minute? [22:36:16] I want to run something by you. [22:36:21] hi atgo! [22:36:30] hi! how are you feeling? [22:36:37] K4-713: maybe….? [22:36:43] almost to a pushing point [22:36:49] I don't want to take you out of the zone. [22:36:57] AndyRussG: which core branches are we pushing to? [22:36:58] And I am 100% interruptable later, so... [22:37:00] Whenever. [22:37:09] kk when I push I'll bug you [22:37:13] ejegg: 1.25wmf16 [22:37:17] cool [22:37:23] * K4-713 respects the Zone above most things [22:39:27] atgo: feeling pretty good - not so much a dinosaur flu as a dino sore throat. Just attacking it before it develops claws [22:39:42] very smart. [22:40:02] trying pizzzacat's garlic+lemon+honey remedy [22:40:10] ejegg: I hate to tell you this, but "just a sore throat" is totally how the dinosaur flu starts. [22:40:19] d'oh [22:40:21] * K4-713 removes the hat I wasn't wearing [22:40:58] yeah, everyone I know has gotten sick in the last couple weeks, so i saw this coming [22:41:22] I think the good news is that if you're not dumb like me, and actually take some days off at the start, it doesn't last as long. [22:41:40] hope so! [22:44:38] ejegg: does this one look like it's good to +2? https://gerrit.wikimedia.org/r/#/c/189733/ [22:45:11] oh, oops, thought that was merged already! [22:46:01] Ah almost... If you're OK I can , or either one of us can... (I rebased it on top of the nitpick change) [22:47:24] (CR) AndyRussG: [C: 2] Merge branch 'master' into wmf_deploy [extensions/CentralNotice] (wmf_deploy) - https://gerrit.wikimedia.org/r/189733 (owner: Ejegg) [22:47:54] wait, have there been more merges to master since this morning? [22:48:07] (Merged) jenkins-bot: Merge branch 'master' into wmf_deploy [extensions/CentralNotice] (wmf_deploy) - https://gerrit.wikimedia.org/r/189733 (owner: Ejegg) [22:48:15] oh, nvm [22:48:18] ejegg: no, I made the nitpick revert on wmf_deploy [22:48:23] needed to update locally [22:48:40] then rebased your same merge patch to on top of nitpick [22:48:46] i made a core submodule bump, but it was pointing to the wrong rev. fixing now [22:48:52] I just +2'd it but I think it's still gotta merge [22:48:54] K4-713: I am frustrated and could use a distraction [22:49:01] Ooookay. [22:49:03] Where are you? [22:49:11] look to your left [22:49:19] haha [22:49:30] Did you see me figuring out what left was? [22:49:32] creepily sitting on the couch [22:49:37] yes, yes I did [22:49:44] I was surprised you didn't use the L trick [22:50:06] pizzzacat: my distraction this afternoon was that I was mean to a door-to-door salesman who I thought was not honest and felt bad about it for like 45 minutes and promised myself I'd try to be nicer [22:50:09] where you put your thumb and fingers into L shapes and whichever hand is the non-backwards L is the Left hand [22:50:21] I'm coming over there now. [22:50:24] O_O [22:50:25] AndyRussG: here's the core commit https://gerrit.wikimedia.org/r/189853 [22:50:25] oh noo AndyRussG [22:50:46] I don't like being put into that position with salesmen :( [22:50:55] I'm guessing you weren't actually that mean… [22:51:00] I mean…I can't imagine it [22:52:21] pizzzacat: I was like, I'm busy, give me your card, and he was like, it'll take 2 minutes, and I'm like, I can call the company you work for to get the same info, bla bla, and he was like, forget it, and I was like OK forget it [22:52:35] Then my kids saw him stomping around in the snow outside the house all frustrated-like [22:52:37] :( [22:53:28] ejegg: if you want to this w/ a hanout audio stream, I'm OK for that anytime [22:53:32] hangout [22:53:38] OK, calling in 1 sec [22:53:40] pizzzacat: thanks for saying that [22:54:52] ejegg: I'm just gonna smoke test this exact combination of versions (current wmf_deploy vs old wmf_deploy) [22:55:22] ok, send me a hangout call when you're ready to roll [22:59:35] ejegg: Ah OK... I just jumped on the same hangout u sent in fact [23:15:58] (PS7) Ssmith: Library and Profile styles and flow [wikimedia/fundraising/dash] - https://gerrit.wikimedia.org/r/188674 [23:17:43] ejegg it works now :) ^^^ [23:21:11] https://www.mediawiki.org/wiki/MediaWiki?random=0.8 [23:21:13] https://www.mediawiki.org/wiki/MediaWiki?random=0.2 [23:21:34] pizzzacat: awesome! [23:21:41] will take a look in a lil bit [23:23:02] no rush ejegg [23:27:30] http://etherpad.wikimedia.org/p/FEGm0gFcXd [23:53:01] § Fundraising Tech Backlog: Hackathon idea: Make DI Friendly - https://phabricator.wikimedia.org/T89188#1029500 (atgo) NEW a:K4-713 [23:53:11] yaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaay [23:53:38] § Fundraising Tech Backlog: Hackathon idea: Make DI Friendly - https://phabricator.wikimedia.org/T89188#1029508 (atgo) @k4-713 add the others as subtasks! eh?