Merge lp://staging/~nataliabidart/ubuntu-webcatalog/law-and-order into lp://staging/ubuntu-webcatalog
Proposed by
Natalia Bidart
Status: | Superseded | ||||
---|---|---|---|---|---|
Proposed branch: | lp://staging/~nataliabidart/ubuntu-webcatalog/law-and-order | ||||
Merge into: | lp://staging/ubuntu-webcatalog | ||||
Diff against target: |
20 lines (+2/-1) 1 file modified
src/webcatalog/models/applications.py (+2/-1) |
||||
To merge this branch: | bzr merge lp://staging/~nataliabidart/ubuntu-webcatalog/law-and-order | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michael Nelson (community) | Approve | ||
Review via email: mp+108204@code.staging.launchpad.net |
Commit message
- Fixed failing tests due to database ordering issues.
- Fixed all the new PEP-8 issues raised by the new version of the pep8 checker.
To post a comment you must log in.
Thanks Natalia!
With the application media ordering, it might be safer (for the future) to set the default ordering on the ApplicationMedia class, rather than on that one call-site (_get_media()).
Anyway, +1 either way (once the conflict is gone).