[Bug 28386] New: Replace dev_map.yaml from release_tools with .mailmap
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 Bug ID: 28386 Summary: Replace dev_map.yaml from release_tools with .mailmap Change sponsored?: --- Product: Koha Version: master Hardware: All OS: All Status: ASSIGNED Severity: enhancement Priority: P5 - low Component: Architecture, internals, and plumbing Assignee: jonathan.druart+koha@gmail.com Reporter: jonathan.druart+koha@gmail.com QA Contact: testopia@bugs.koha-community.org Depends on: 26621 To generate the release notes, the history.txt and contributors.yaml files we are using a custom dev_map.yaml in the release_tools repo. Instead we should improve our .mailmap and use it for that purpose (author's disambiguation) Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26621 [Bug 26621] .mailmap adjustments -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 Jonathan Druart <jonathan.druart+koha@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 --- Comment #1 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Created attachment 121153 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=121153&action=edit Bug 28386: Adjust .mailmap Again, we need to adjust our .mailmap This time the goal is the use it in place of the dev_map.yaml we have in the release tools. This will be generated for the release notes, history.txt and contributors.yaml file This can be tested using: git check-mailmap "author <email>" For instance: git check-mailmap "Wrong name <jonathan.druart@bugs.koha-community.org>" -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 --- Comment #2 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Created attachment 121154 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=121154&action=edit Bug 28386: Some manual removals from contributors.yaml Those are not real authors and should be removed from the contributors.yaml file -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 --- Comment #3 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Created attachment 121155 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=121155&action=edit Bug 28386: Remove unknown authors Those 3 authors are not in the git history, we should remove them from the author list. However we could re-add them to the contributor list with a note saying for instance they were part of the Catalyst Academy (need to double check that first) -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 --- Comment #4 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Created attachment 121156 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=121156&action=edit Bug 28386: Update Nicole Need to match .mailmap -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 --- Comment #5 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Created attachment 121157 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=121157&action=edit Bug 28386: Update Kyle Need to match .mailmap -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 --- Comment #6 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Created attachment 121158 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=121158&action=edit Bug 28386: Meenakshi.R vs Meenakshi R Needs to match .mailmap -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 --- Comment #7 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Created attachment 121159 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=121159&action=edit Bug 28386: Update Hector -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 --- Comment #8 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Created attachment 121160 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=121160&action=edit Bug 28386: Add history_notes The "developer" lines of history.txt will be regenerated using the git history so we need to add this as a separate info. See the release_tools changes for more info -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 --- Comment #9 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Created attachment 121161 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=121161&action=edit Bug 28386: [DO NOT PUSH] Update contributors using script This is an example of what will be regenerated. It will need to be regenerated once it will be pushed -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 --- Comment #10 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Created attachment 121162 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=121162&action=edit Bug 28386: [DO NOT PUSH] Update history using script This is an example of what will be regenerated. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 --- Comment #11 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- This must be tested with the merge requests linked with https://gitlab.com/koha-community/release-tools/-/issues/23 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 Jonathan Druart <jonathan.druart+koha@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #121161|Bug 28386: [DO NOT PUSH] |Bug 28386: [DO NOT PUSH] description|Update contributors using |Update contributors using |script |script -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 Jonathan Druart <jonathan.druart+koha@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #121162|Bug 28386: [DO NOT PUSH] |Bug 28386: [DO NOT PUSH] description|Update history using script |Update history using script -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 --- Comment #12 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Created attachment 121177 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=121177&action=edit Bug 28386: Disambiguate Séverine (to squash) -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 --- Comment #13 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Created attachment 121180 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=121180&action=edit Bug 28386: Add sponsors to .mailmap They were in dev_map.yaml, we are cheating with the <sponsor> email but it seems to work fine in my tests -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 Jonathan Druart <jonathan.druart+koha@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Keywords| |rel_21_05_candidate -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #121153|0 |1 is obsolete| | --- Comment #14 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 121245 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=121245&action=edit Bug 28386: Adjust .mailmap Again, we need to adjust our .mailmap This time the goal is the use it in place of the dev_map.yaml we have in the release tools. This will be generated for the release notes, history.txt and contributors.yaml file This can be tested using: git check-mailmap "author <email>" For instance: git check-mailmap "Wrong name <jonathan.druart@bugs.koha-community.org>" Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #121154|0 |1 is obsolete| | --- Comment #15 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 121246 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=121246&action=edit Bug 28386: Some manual removals from contributors.yaml Those are not real authors and should be removed from the contributors.yaml file Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #121155|0 |1 is obsolete| | --- Comment #16 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 121247 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=121247&action=edit Bug 28386: Remove unknown authors Those 3 authors are not in the git history, we should remove them from the author list. However we could re-add them to the contributor list with a note saying for instance they were part of the Catalyst Academy (need to double check that first) Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #121156|0 |1 is obsolete| | --- Comment #17 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 121248 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=121248&action=edit Bug 28386: Update Nicole Need to match .mailmap Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #121157|0 |1 is obsolete| | --- Comment #18 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 121249 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=121249&action=edit Bug 28386: Update Kyle Need to match .mailmap Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #121158|0 |1 is obsolete| | --- Comment #19 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 121250 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=121250&action=edit Bug 28386: Meenakshi.R vs Meenakshi R Needs to match .mailmap Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #121159|0 |1 is obsolete| | --- Comment #20 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 121251 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=121251&action=edit Bug 28386: Update Hector Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #121160|0 |1 is obsolete| | --- Comment #21 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 121252 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=121252&action=edit Bug 28386: Add history_notes The "developer" lines of history.txt will be regenerated using the git history so we need to add this as a separate info. See the release_tools changes for more info Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 --- Comment #22 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 121253 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=121253&action=edit Bug 28386: [DO NOT PUSH] Update contributors using script This is an example of what will be regenerated. It will need to be regenerated once it will be pushed Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 --- Comment #23 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 121254 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=121254&action=edit Bug 28386: [DO NOT PUSH] Update history using script This is an example of what will be regenerated. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 --- Comment #24 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 121255 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=121255&action=edit Bug 28386: Disambiguate Séverine (to squash) Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #121180|0 |1 is obsolete| | --- Comment #25 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 121256 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=121256&action=edit Bug 28386: Add sponsors to .mailmap They were in dev_map.yaml, we are cheating with the <sponsor> email but it seems to work fine in my tests Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |martin.renvoize@ptfs-europe | |.com Attachment #121177|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #121162|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #121161|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off --- Comment #26 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Great work Jonathan, this is a massive improvement. Signing off. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Failed QA CC| |victor@tuxayo.net --- Comment #27 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Issue found :o https://gitlab.com/koha-community/release-tools/-/merge_requests/20#note_582... -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 Jonathan Druart <jonathan.druart+koha@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Signed Off --- Comment #28 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Answered. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 --- Comment #29 from Victor Grousset/tuxayo <victor@tuxayo.net> --- It work! Thanks for finding the issue. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 --- Comment #30 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Created attachment 121329 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=121329&action=edit Bug 28386: fisheye is certainly Olwen After a chat with Chris it seems that fisheye was Olwen. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 --- Comment #31 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Created attachment 121330 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=121330&action=edit Bug 28386: Fix Pawel history notes -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 Jonathan Druart <jonathan.druart+koha@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #121253|0 |1 is obsolete| | Attachment #121254|0 |1 is obsolete| | --- Comment #32 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Created attachment 121331 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=121331&action=edit Bug 28386: Update contributors using script This is an example of what will be regenerated. It will need to be regenerated once it will be pushed -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 --- Comment #33 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Created attachment 121332 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=121332&action=edit Bug 28386: Update history using script This is an example of what will be regenerated. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 --- Comment #34 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Created attachment 121354 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=121354&action=edit Bug 28386: Add the 3 unknown authors back into the contributors list with a note -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 Jonathan Druart <jonathan.druart+koha@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #121354|0 |1 is obsolete| | --- Comment #35 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Created attachment 121355 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=121355&action=edit Bug 28386: Add the 3 unknown authors back into the contributors list with a note -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 Jonathan Druart <jonathan.druart+koha@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 Jonathan Druart <jonathan.druart+koha@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Pushed to master Version(s)| |21.05.00 released in| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 --- Comment #36 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Pushed to master for 21.05, thanks to everybody involved! -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |28442 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28442 [Bug 28442] Release team 21.05 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 Jonathan Druart <jonathan.druart+koha@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Keywords|rel_21_05_candidate | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 --- Comment #37 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Created attachment 121378 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=121378&action=edit Bug 28386: Add more disambiguations to .mailmap -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 Jonathan Druart <jonathan.druart+koha@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #121378|0 |1 is obsolete| | --- Comment #38 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Created attachment 121384 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=121384&action=edit Bug 28386: Add more disambiguations to .mailmap -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 --- Comment #39 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Last patch pushed to master. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 --- Comment #40 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Some tiny changes expected on gitstats Before (yesterday): https://web.archive.org/web/20210525073657/https://git.koha-community.org/st... After (today): https://web.archive.org/web/20210526080539/https://git.koha-community.org/st... -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 --- Comment #41 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Created attachment 121420 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=121420&action=edit Bug 28386: Disambiguate Tomas and Blou -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 --- Comment #42 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Last patch pushed to master. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 --- Comment #43 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Created attachment 121447 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=121447&action=edit Bug 28386: Remove _others_ from the contributor list We arbitrarily use "_others_" for unknown contributors (biblibre, bywater, ptfs-e teams, etc) -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 --- Comment #44 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Created attachment 121448 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=121448&action=edit Bug 28386: Sort authors by lastname || firstname If several authors have the same lastname, they are swapped in the list between the different runs. This is reusing the code from the release_tools, see issue #24 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 --- Comment #45 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Last 2 patches pushed to master. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Pushed to master |Pushed to stable -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 Bug 28386 depends on bug 26621, which changed state. Bug 26621 Summary: .mailmap adjustments https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26621 What |Removed |Added ---------------------------------------------------------------------------- Status|Pushed to oldoldstable |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |fridolin.somers@biblibre.co | |m Version(s)|21.05.00 |21.05.00,20.11.07 released in| | Status|Pushed to stable |Pushed to oldstable --- Comment #46 from Fridolin Somers <fridolin.somers@biblibre.com> --- Pushed to 20.11.x for 20.11.07 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Version(s)|21.05.00,20.11.07 |21.05.00,20.11.07,20.05.13 released in| | Status|Pushed to oldstable |Pushed to oldoldstable --- Comment #47 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Backported: Pushed to 20.05.x branch for 20.05.13 After around 130 conflicts! (How did Frido, Kyle and Nick dealt with this?) Hint in case Wainui gets the same thing: Solve the individual conflicts as usual. When getting a 60 conflicts pack, just rapidly skim through then without solving to confirm that it will be safe to do `git checkout --theirs MY_FILE` It was safe in my case (noticed after manually solving the 60 ones...) There is another 60 conflicts pack, do the same as above. The timeline in the about page isn't broken, so that seems to work ^^ and Jonathan told me that we should keep the commit numbers from upstream, not the one from our branch. And it's not used anyway. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 wainuiwitikapark@catalyst.net.nz changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |wainuiwitikapark@catalyst.n | |et.nz --- Comment #48 from wainuiwitikapark@catalyst.net.nz --- Should this be backported to 19.11.x? For 19.11.20 (next release in July)? -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 --- Comment #49 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Yes, in bug 28442 it's mentioned that it will have to be backported to all stables. And this one it a dependency. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 --- Comment #50 from wainuiwitikapark@catalyst.net.nz --- Backported to 19.11.x for 19.11.20 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 wainuiwitikapark@catalyst.net.nz changed: What |Removed |Added ---------------------------------------------------------------------------- Version(s)|21.05.00,20.11.07,20.05.13 |21.05.00,20.11.07,20.05.13, released in| |19.11.20 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28386 wainuiwitikapark@catalyst.net.nz changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |FIXED Status|Pushed to oldoldstable |RESOLVED -- You are receiving this mail because: You are watching all bug changes.
participants (1)
-
bugzilla-daemon＠bugs.koha-community.org