Merge lp:~cjwatson/launchpad/getMergeProposals-timeout into lp:launchpad
Proposed by
Colin Watson
Status: | Merged |
---|---|
Merged at revision: | 18186 |
Proposed branch: | lp:~cjwatson/launchpad/getMergeProposals-timeout |
Merge into: | lp:launchpad |
Diff against target: |
156 lines (+81/-8) 3 files modified
lib/lp/code/interfaces/hasbranches.py (+5/-3) lib/lp/code/model/branchmergeproposal.py (+20/-3) lib/lp/code/model/tests/test_hasbranches.py (+56/-2) |
To merge this branch: | bzr merge lp:~cjwatson/launchpad/getMergeProposals-timeout |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
William Grant | code | Approve | |
Review via email: mp+305065@code.launchpad.net |
Commit message
Make Person.
Description of the change
Make Person.
To post a comment you must log in.
I'd like the new test to use a READ_PRIVATE token and include various private MPs, since the dominant queries in the OOPSes were actually permission checks.