[15:24:36] Have a nice code-review hour today, I'm not here today ;) (E207) [20:00:10] Hello everyone... I'm going to just jump right in and start going through the list on https://phabricator.wikimedia.org/E204 [20:01:32] I can't be here today, but if you have some time left, you can take a look at this one (not in the list because it's just finisehd): https://gerrit.wikimedia.org/r/#/c/293555/ [20:01:46] MGChecker: sure thanks [20:01:59] o/ [20:04:07] Hello. [20:06:38] merging https://gerrit.wikimedia.org/r/#/c/244139/ [20:06:52] twentyafterfour: cheers :) [20:10:58] I'm not really well qualified to review the rest of the patches nominated on E204 [20:19:33] I am unsure on how to proceed now [20:20:02] Saying hello may be a good start. [20:20:04] Hello [20:20:06] Hi [20:20:12] I'm looking at your gwtoolset patch [20:20:53] Cool. Hopefully it is not too old to merge. I am not really sure how to rebase stuff and so. [20:22:48] Ah I see you just switched to PHP 5.4+ arrays [20:23:01] Rebasing is actually not as hard as it sounds [20:23:24] Touching wood. [20:24:05] jenkins is slooow... [20:24:20] But basically all you have to do to rebase is. git review -d [20:24:28] git rebase origin/master [20:24:30] Last time I tried this I got a change into the Wikibase extension without +2 or merge right to the repo [20:25:15] Ah, ok. The first line is very familiar. + the second one? That's all?! [20:25:33] Well this is indeed easier than it sounds. [20:25:34] Then if you get conflicts, you open the individual files. a line starting with <<<<<< to the line ending with ===== is your version, and the lines from ======= to >>>>>>>>> is the new version, and you pick which one is more right, and delete all the extra stuff [20:25:44] and then do git add [20:25:49] then do git rebase --continue [20:25:54] and then do git review [20:26:15] I am scribing this. [20:27:20] (Actually, I missed a step. before you start doing anything, you should do git pull so that your local copy of the repo is relatively up to date) [20:27:53] No worries. [20:30:18] kghbln: https://github.com/thomasbachem/php-short-array-syntax-converter allowed me to convert without any issue a 12K lines PHP file [20:30:58] kghbln: For the access control extension, I guess the question is how do we know they meant GPLv2 and not some other version of GPL [20:31:11] Like its probably a safe assumption, but I'm not sure they actually say that anywhere [20:32:01] let me have a look [20:32:29] or if they want just GPL2 not GPL2+ [20:34:45] kghbln: want to take a look at https://gerrit.wikimedia.org/r/#/c/292578/ ? [20:38:28] well until version 0.9 were was no license information in the main file at all which supports GPL-2.0+ [20:38:48] Trying to find out who acutally added the GPL [20:40:02] We could send the original author an email and ask [20:43:55] hopefully there are more than 1 Josh Greenberg. The first I found died. :( [20:44:32] oh, that's sad [20:44:40] I was thinking of User:Want [20:52:16] Want recycled code from magicmonty on github who himself recycled from Josh Greenberg https://www.mediawiki.org/wiki/Project:WikiProject_Extensions/Projects/Recovery/Candidate1 [20:52:39] at least this was documented properly [20:59:14] this extension is so completely and fundamentally broken... [21:04:47] kghbln, I can think of at leat half dozen ways to work around that extension's "protection" [21:04:55] *at least [21:06:19] MaxSem I do not doubt that [21:06:44] I use it to protect files in conjuction with the Lockdown extension [21:07:14] what's the point if it's ridiculously easy to ignore? [21:09:08] The point is that there is no working or better alternative to protect files in conjuction with different user groups [21:09:22] So we are talking about better than nothing. [21:10:37] illusion is better than nothing? :) [21:10:53] That's what I call life :D [21:10:57] depends on your threat model ;) [21:12:10] In my case it is only closed wikis without any public access + people how hardly know the difference between section 2 and section 3 headers. [21:12:21] Solid enough to me. :) [21:13:35] I'll tell them about [[Media:Your sikrit file]] lifehack [21:14:33] thanks for the reviews, Dereckson! [21:14:48] You're welcome mdholloway [21:15:44] thanks to florian as well, though he's not around to see it [21:15:59] :) [21:16:04] Anyways, GWToolset got merged [21:16:11] So thanks a lot!