[08:06:09] New patchset: Henning Snater; "showing loading spinner while JavaScript is initialising" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/27668 [08:21:55] New patchset: Henning Snater; "refactored toolbar group QUnit test" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/27669 [08:28:26] New patchset: Henning Snater; "refactored toolbar QUnit tests" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/27670 [08:32:41] Change merged: Tobias Gritschacher; [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/27669 [08:32:57] Change merged: Tobias Gritschacher; [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/27670 [08:58:10] New patchset: Aude; "per bug 40354, inject recent changes nicely" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/27392 [09:25:30] New patchset: Henning Snater; "displaying data type label on property page" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/27672 [09:42:26] New patchset: Tobias Gritschacher; "change wait_for_entity method to use the spinner" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/27673 [09:43:38] Change merged: Tobias Gritschacher; [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/27668 [09:43:58] Change merged: Tobias Gritschacher; [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/27673 [10:03:59] Change merged: Tobias Gritschacher; [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/27672 [10:22:37] Danielwe_WMDE, JeroenDeDauw: https://bugzilla.wikimedia.org/show_bug.cgi?id=40545 Please add comments with gerrit commit ids in there [10:23:15] a68a18d3dc7f372f019a005c2ce22e563479eb54 and dd77787bb520f10277e61ac22ec50d692b6667d2 [10:23:17] AnjaJ_WMDE: ^ [10:48:18] Jens_WMDE: had to do a "git reset -- lib/includes/claim/ClaimAggregate.php" first [10:48:32] Then "git checkout -- lib/includes/claim/ClaimAggregate.php" worked [10:50:56] Change merged: Anja Jentzsch; [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/27674 [10:51:59] JeroenDeDauw: ah! [10:56:46] AnjaJ_WMDE: okay, wikipedia tells me that Andrew Plotkin (who thought invented the game) actually only gave a Soviet game the Werewolf theme in 1997: http://en.wikipedia.org/wiki/Mafia_(party_game) [10:57:08] "... who I thought" [11:03:36] DanielK_WMDE: when you commit, we have a bug number for failed searchenginetest [11:03:39] https://bugzilla.wikimedia.org/show_bug.cgi?id=40716 [11:18:12] what needs to be backported into the phase 1 branch: https://docs.google.com/a/wikimedia.de/document/d/1k6ShnElokN6bpohNBwzljr5F0FJtLyve-9ti8xsFkO0/edit [12:11:20] hey, will the Statement Mayor of Berlin is Klaus Wowereit (https://meta.wikimedia.org/wiki/Wikidata/Notes/Data_model_primer) link to the Data entry Klaus Wowereit or to the homewiki entry of Klaus Wowereit [12:16:48] ooh 404 error on wikidata... [12:25:59] Sk1d: better now? (Sorry!) [12:27:35] New patchset: Henning Snater; "refactored params of wikibaseAutocomplete" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/27678 [12:28:44] jep [12:29:10] New: http://en.wikidata-test-repo.wikimedia.de/wiki/Helium, he.wikidata-test-repo.wikimedia.de/title/הליום [12:29:57] and of course hu.wikidata-test-repo.wikimedia.de/wiki/Hélium [12:31:49] when will there be the next wikidata office hour? https://meta.wikimedia.org/wiki/Wikidata/Events#IRC_office_hours is not uptodate [12:35:00] Change merged: Tobias Gritschacher; [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/27678 [12:35:35] Sk1d: true... I'll ask Lydia_WMDE_ when she's back from lunch [12:44:16] Sk1d: it'd link to the wikidata entry [12:44:33] the next office hour i still need to figure out with Denny_WMDE [12:44:40] but we want it to be close to the first deployment [12:44:48] so hopefully soon (TM) [13:10:09] Change on 12mediawiki a page Extension:Wikibase was modified, changed by Denny link https://www.mediawiki.org/w/index.php?diff=592994 edit summary: /* Setting up items in the main namespace */ [13:18:14] Change on 12mediawiki a page Extension:Wikibase was modified, changed by Denny link https://www.mediawiki.org/w/index.php?diff=592995 edit summary: /* Setting up items in the main namespace */ [13:29:23] New patchset: Daniel Werner; "(bug 40951) moved most resource files including QUnit tests to lib" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/27679 [13:42:11] New patchset: Daniel Werner; "(bug 40951) moved most resource files including QUnit tests to lib" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/27679 [13:43:04] New patchset: Jeroen De Dauw; "Statements are now Claims, rather then containing claims (for great consistency w/ the api)" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/27680 [13:43:05] New patchset: Jeroen De Dauw; "Implemented save in ApiCreateClaim and fixed stubbing issue in EntityObject causing equals to fail" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/27681 [13:43:05] New patchset: Jeroen De Dauw; "Moved special handling of ID from the equality check in entity to the one in entytcontent" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/27529 [13:43:05] New patchset: Jeroen De Dauw; "Implemented Item::getClaims" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/27545 [13:44:12] New patchset: Daniel Werner; "(bug 40951) moved most resource files including QUnit tests to lib" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/27679 [13:48:26] Change merged: Henning Snater; [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/27679 [13:59:00] Denny_WMDE: http://dpaste.org/beffN/ [14:00:25] JeroenDeDauw: +2 [14:04:27] New patchset: Aude; "per bug 40353, inject recent changes nicely [DO NOT MERGE]" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/27392 [14:10:28] New patchset: Anja Jentzsch; "(Bug 40523) Add escaping to output in EditEntityAction" [mediawiki/extensions/Wikibase] (wikidata-wmfphase1beta) - https://gerrit.wikimedia.org/r/27684 [14:11:38] Change merged: Anja Jentzsch; [mediawiki/extensions/Wikibase] (wikidata-wmfphase1beta) - https://gerrit.wikimedia.org/r/27684 [14:12:26] New review: Anja Jentzsch; "merged I01345cc3" [mediawiki/extensions/Wikibase] (wikidata-wmfphase1beta) - https://gerrit.wikimedia.org/r/27684 [14:13:13] New patchset: Anja Jentzsch; "Added SitesModule to load site data" [mediawiki/extensions/Wikibase] (wikidata-wmfphase1beta) - https://gerrit.wikimedia.org/r/27685 [14:13:43] Change merged: Anja Jentzsch; [mediawiki/extensions/Wikibase] (wikidata-wmfphase1beta) - https://gerrit.wikimedia.org/r/27685 [14:14:31] New patchset: Anja Jentzsch; "SitesModule will work with $wgLegacyJavaScriptGlobals = false; now" [mediawiki/extensions/Wikibase] (wikidata-wmfphase1beta) - https://gerrit.wikimedia.org/r/27686 [14:14:51] Change merged: Anja Jentzsch; [mediawiki/extensions/Wikibase] (wikidata-wmfphase1beta) - https://gerrit.wikimedia.org/r/27686 [14:27:27] New patchset: Tobias Gritschacher; "tests for client recent changes" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/27276 [14:50:22] New patchset: Jeroen De Dauw; "Imrpoved Claim and Statement serialization and GUID handling" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/27693 [14:53:52] New review: Jeroen De Dauw; "Stubbing was broken here (making many tests fail), fixed in I4449b0a3046145c6e03c9e8e04f04c4443380204" [mediawiki/extensions/Wikibase] (master); V: 0 C: 0; - https://gerrit.wikimedia.org/r/27681 [14:54:58] I can haz review pl0x! https://gerrit.wikimedia.org/r/#/dashboard/44 [14:55:11] 10 of those commits form a dependency chain [15:11:22] New patchset: Anja Jentzsch; "Removed transaction logic from ChangeNotifier." [mediawiki/extensions/Wikibase] (wikidata-wmfphase1beta) - https://gerrit.wikimedia.org/r/27708 [15:11:23] Change merged: Anja Jentzsch; [mediawiki/extensions/Wikibase] (wikidata-wmfphase1beta) - https://gerrit.wikimedia.org/r/27708 [15:41:22] New patchset: Henning Snater; "removing loading spinner on error" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/27719 [15:45:15] New patchset: Jens Ohlig; "Create test script to create properties" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/27720 [15:53:22] DanielK_WMDE: I'd appriciate it if you could show me how to do the "submit branch to gerrit for review" thing [15:59:25] New patchset: Jeroen De Dauw; "Removed the sites code as it now got merged with core" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/27726 [16:01:39] New patchset: Jeroen De Dauw; "Up install notes" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/27727 [16:02:54] Change merged: Jeroen De Dauw; [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/27727 [16:08:26] New patchset: Jeroen De Dauw; "Backport 4145c4f7037e036bc6ffc2fc5397827d4cde2620" [mediawiki/extensions/Wikibase] (wikidata-wmfphase1beta) - https://gerrit.wikimedia.org/r/27728 [16:14:42] JeroenDeDauw: why is sitepaths and sitephatsobject not removed? [16:31:46] Change merged: Jeroen De Dauw; [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/27726 [16:41:06] JeroenDeDauw: well, you don't submit the branch, you submit the merge commit that merged the branch into master (or some oether remote branch). [16:41:24] you probably want to bypass git review and use gerrit's "official" way to submit that: [16:41:39] git push origin refs/for/master [16:41:51] (replace "master" with the remote branche's name) [16:42:22] DanielK_WMDE: so I can happily work on a branch not caring about gerrit and then only have to figure out how to push the merge commit to gerrit when I'm done? [16:43:21] JeroenDeDauw: you could, but that means someone has to review your entire work as one chunk. that's... discouraged. [16:43:56] this method can also be used of course to merge a remote branch into the master. as we did with the Wikidata branch [16:44:01] oh, it's HEAD:refs/for/master [16:44:06] this one is nice: [16:44:10] git config --global alias.push-for-review "push gerrit HEAD:refs/for/master" [16:44:26] though it kind of sucks that you hard code "master" there [16:45:26] JeroenDeDauw: there's more info on https://www.mediawiki.org/wiki/Git/Workflow [16:45:34] just search for refs/for/master on that page [16:46:09] DanielK_WMDE: well, have a look at the 10 ApiCreateClaim related commits I have not sitting on gerrit - this is also not so nice - it becomes a mess if one gets amended and it makes review more difficult because stuff is split out and people might wonder or comment about stuff that's been removed in a later commit anyway [16:46:16] Thnx for pointers [16:53:42] Change merged: Daniel Werner; [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/27719 [16:54:32] JeroenDeDauw: you could just squash them# [16:54:52] But that's evil [16:55:03] JeroenDeDauw: no, it's actually necessary for review [16:55:21] there is no way in gerrit to see the changes done by the branch when looking at he merge commit [16:55:22] Sure, squash for review is good, but not for merge [16:55:26] (yes, that is stupid) [16:55:33] gerrit will only show edits done to resolve conflicts [16:56:06] well then you'll have to do what we did for Wikidata: make two commits. a squashed one to look at, and a merge commit to actually, well, merge [16:56:19] hmpf [16:56:53] i really wish gerrit would just let me pick either branch as the base for the diffs, in addition to "auto merge", which gives me the diffs that resolved conflicts [17:03:56] New review: Daniel Werner; "Fatal error: Call to undefined method Wikibase\EditEntity::showStatus() in D:\Wikidata\gerrit.wikime..." [mediawiki/extensions/Wikibase] (master); V: -1 C: 0; - https://gerrit.wikimedia.org/r/27519 [17:07:52] New patchset: Jeroen De Dauw; "Fixed display of errors on Special:NewProperty" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/27519 [17:08:10] New patchset: Jeroen De Dauw; "Fixed display of errors on Special:NewProperty" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/27519 [17:08:15] Change merged: Daniel Werner; [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/27520 [17:13:50] Change merged: Daniel Werner; [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/27522 [17:15:35] New patchset: Denny Vrandecic; "Setting default of apiDebugWithWrite to false" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/27742 [17:34:37] New patchset: Jeroen De Dauw; "Fixed typo" [mediawiki/extensions/Wikibase] (master) - https://gerrit.wikimedia.org/r/27743 [17:47:15] New review: Daniel Kinzler; "see denny's comment" [mediawiki/extensions/Wikibase] (wikidata-wmfphase1beta); V: 0 C: -1; - https://gerrit.wikimedia.org/r/27728 [20:54:39] New review: awjrichards; "-2'ing to prevent submission. Is this still needed or can it just be abandoned?" [mediawiki/extensions/Wikibase] (master); V: 0 C: -2; - https://gerrit.wikimedia.org/r/12222 [23:33:33] New review: awjrichards; "-2'ing to prevent merge per comment" [mediawiki/extensions/Wikibase] (master); V: 0 C: -2; - https://gerrit.wikimedia.org/r/22059