Merge lp://qastaging/~salgado/offspring/builder-list into lp://qastaging/~linaro-automation/offspring/private-builds
Proposed by
Guilherme Salgado
| Status: | Merged |
|---|---|
| Approved by: | James Tunnicliffe |
| Approved revision: | 67 |
| Merged at revision: | 63 |
| Proposed branch: | lp://qastaging/~salgado/offspring/builder-list |
| Merge into: | lp://qastaging/~linaro-automation/offspring/private-builds |
| Diff against target: |
223 lines (+91/-32) 5 files modified
lib/offspring/web/queuemanager/tests/test_views.py (+48/-0) lib/offspring/web/queuemanager/views.py (+30/-10) lib/offspring/web/templates/queuemanager/builders.html (+9/-5) lib/offspring/web/urls.py (+2/-16) requirements/requirements.web.txt (+2/-1) |
| To merge this branch: | bzr merge lp://qastaging/~salgado/offspring/builder-list |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| James Tunnicliffe (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
This branch changes the builder list to redact information about private projects the user doesn't have the rights to see.
I've also noticed that no versions of django are able to work with Oneiric's psycopg2 package (version 2.4.2), so I've changed the requirements to specify we need psycopg2>
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks fine.