Merge lp://qastaging/~milo/linaro-patchmetrics/patch-from-upstream into lp://qastaging/linaro-patchmetrics
Proposed by
Milo Casagrande
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 372 | ||||
| Proposed branch: | lp://qastaging/~milo/linaro-patchmetrics/patch-from-upstream | ||||
| Merge into: | lp://qastaging/linaro-patchmetrics | ||||
| Diff against target: |
1181 lines (+1082/-8) 10 files modified
apps/patchwork/bin/parsemail.py (+1/-1) apps/patchwork/filters.py (+8/-2) apps/patchwork/parser.py (+1/-1) apps/patchwork/tests/filters.py (+9/-0) apps/patchwork/tests/mail/0004-git-pull-request-git+ssh.mbox (+348/-0) apps/patchwork/tests/mail/0005-git-pull-request-ssh.mbox (+348/-0) apps/patchwork/tests/mail/0006-git-pull-request-http.mbox (+348/-0) apps/patchwork/tests/patchparser.py (+15/-0) apps/patchwork/tests/utils.py (+2/-2) apps/settings.py (+2/-2) |
||||
| To merge this branch: | bzr merge lp://qastaging/~milo/linaro-patchmetrics/patch-from-upstream | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Paul Sokolovsky | Approve | ||
| James Tunnicliffe | Pending | ||
| Linaro Infrastructure | Pending | ||
|
Review via email:
|
|||
Description of the change
Cherry-picked some patches from the upstream project.
Not all the upstream patches have been ported, these are the ones that do not cange DB models, and some might not even bother us (but at least we are a little bit more aligned).
To post a comment you must log in.
Revision history for this message
| Paul Sokolovsky (pfalcon) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
I hope one day light will shine on us and we will be allowed to use git to track upstream git projects. That will also give us free protection against typos like "herry-picked" & "from upstrea." ;-)