[09:06:22] Question guys, we migrated our tools project to Gerrit and have our first commit here: https://gerrit.wikimedia.org/r/#/c/labs/tools/gdrive-to-commons/+/606261/ Do I get some Jenkins or something to automatically merge these things after someone +2 it ? I remember we had to add it somewhere, but is it available for tool-labs projects ? Also, I dont know how to merge this patch at this point as the status is "Ready tro Submit". [09:16:36] okey, so probably I have to add things to https://phabricator.wikimedia.org/source/integration-config/browse/master/zuul/layout.yaml [09:20:30] tonythomas: submit is practically same as merge [09:21:34] and yes, you would have found the correct file to add things to [09:23:31] when you have jenkins set up it will automatically merge if there is a CR+2 and builds pass so you won't have to do it yourself but for now you need to do that manually [09:24:43] Majavah: nice. I would expect so (from my previous repo). Anyway, we are making a patchset to that repo soon. [13:24:06] Reedy: PHPStorm plugin changes look good. The only differences I could spot: 1-I couldn't find SPACES_AROUND_VAR_WITHIN_BRACKETS, but perhaps it's already false by default; 2-SPACE_AFTER_TYPE_CAST should be set to false [13:24:46] Daimona: SPACE_AFTER_TYPE_CAST isn't in https://www.mediawiki.org/w/index.php?title=User:Daimona_Eaytoy/Sandbox&oldid=3904461 [13:24:52] Neither is SPACES_AROUND_VAR_WITHIN_BRACKETS :P [13:25:00] So hence no inclusion/change of them [13:25:51] Ah crap, they're from my JS coding style, that's why :D [13:26:36] They should probably be set for PHP too, if available [13:27:59] No, wait, they're actually PHP settings. Just in a different section, so I probably forgot to copy them on mw.org [13:33:50] Not my fault then :P [13:35:17] Nah, shame on me :P [13:35:39] I was very confused [19:30:40] Interesting: I did *not* get an edit conflict for this https://meta.wikimedia.org/w/index.php?title=Talk%3ACommunications%2FWikimedia_brands%2F2030_movement_brand_project%2FExecutive_statement&type=revision&diff=20194943&oldid=20194942 [19:31:09] (The text I submitted didn't include Sj's paragraphs.) [19:47:59] Nemo_bis: probably because of the extra newline [19:49:01] The algo works on a by paragraph (newline) basis, so having an extra empty paragraph might make it seem you are not conflicting with sj [20:02:12] bawolff: I'm not sure I submitted that newline [20:03:46] Oh well, thats weird then [20:04:26] But GNU diff3 is a bit of a mystery. It works but i have never heard an explanation of what it actually does [20:09:18] * Nemo_bis sends to quips [20:09:54] heh https://bash.toolforge.org/quip/AVbdofvcaH8PnNb4D2av [20:10:35] There we go https://bash.toolforge.org/quip/6WM0znIBj_Bg1xd3LKiA [20:17:22] Woo fame! [20:32:56] Wow, this whole situation gets more wtf by the moment [20:33:57] bawolff: next up, rewriting history on the fishbowl wikis [20:34:26] someone backup the database [20:35:37] /the board made the request in a slide of a presentation i presented to them!/ [20:36:29] Like wat. How?! [20:36:48] At what point does this verge into criminal behaviour? [20:37:10] We could ask Matt Levine. He says "everything is securities fraud" https://www.bloomberg.com/opinion/authors/ARbTQlRLRjE/matthew-s-levine [20:37:26] Just find some security linked to a Wikimedia brand, there must be some on Robin Hood