Based on the archeology I just did for #1998044: Port issue metric sparklines in statistics block on project pages to D7 I'm now worried that we've got some other regressions in the D7 port since there have been some things happening in the 6.x-1.x branch since we created the 7.x-2.x branch, and apparently we haven't been careful about either committing to both branches or merging. Merging sucks since D7 is a nearly complete rewrite, so a trial git merge is full of insane conflicts. At this point, I think the best approach would be:

  • Find the commit the 7.x-2.x branch was created from
  • Review all the commits on the 6.x-1.x branch since then. For each one, confirm either:
    1. The commit/issue is already ported to D7
    2. Commit is now irrelevant for D7
    3. Cherry pick the commit into D7 and port it (or at least submit a new D7 issue about it with the relevant commit hash)

Comments

drumm’s picture

drumm
he/him
Location NY, US
commented
Assigned: Unassigned » drumm
drumm’s picture

drumm
he/him
Location NY, US
commented
Status: Active » Fixed

I made commits to bring everything forward except those related to #1560012: Port per-user issue notification email functionality to D7 and #1998044: Port issue metric sparklines in statistics block on project pages to D7:

d4f09e7 (HEAD, origin/6.x-1.x, 6.x-1.x) Issue #1879676 by tsvenson: Move the issue # to the end of the <title>. Because numbers.
6b68ad9 No-op to get jenkins to package this to d.o
3fe24d7 Issue #872774 by dww: Automatically subscribe users to issues in their project on node creation
d874747 Issue #1864988 by greg.1.anderson | dww: Add issue number to window title
47af4e5 #1321190: Queries for issue notification e-mail sometimes generate faulty SQL Do not case SQL errors when no one is following an issue.
5b12524 Issue #1556468 by hunmonk, mikey_p, dww: Visualize project issue metrics on project pages
c793ed6 #112805: JSON menu callback for project issues by dww: Fixed parameters for JSON alter hook.
ed69763 #1730728: Project issue json needs comment index number included in data structure by dww: Followup to change the key to just 'subject'.
f49dbc2 #1730728: Project issue json needs comment index number included in data structure by greg.1.anderson, dww: Add comment subject into JSON output.
34ca661 #1211500: Body and Title field labels are hard-coded by webchick, dww: Removed hard-coded Body and Title field labels.
b44e639 Issue #112805 by sun, dww: Fixed more problems in the issue JSON output.
7c2cb59 Issue #112805 by sun: Fixed inconsistencies in project_issue JSON output.
4576171 clean up descriptions for new_issues_comments_by_project and reporters_participants_by_project metrics.
6e07ff0 pull distinct list of projects that have issues for all metrics.
26d6a8c always use db_query_slave instead of db_query for metrics collection.
efffec3 fix all metrics queries to only pull projects that have at least one issue.
05b6c14 #1211058: "Oldest open issue" in project issue cockpit is meaningless by sun: Removed the 'Oldest open issue' from the issue block.
5c67ddc #1304550: Display count of issue followers when viewing an issue by dww, jhedstrom: Display count of followers on issues.
30522b8 #112805: JSON menu callback for project issues by moshe weitzman, greg.1.anderson, xjm, hunmonk, sun, dww: Added a JSON menu callback (node/%/project-issue/json) for issue metadata.

Automatically closed -- issue fixed for 2 weeks with no activity.