Merge lp://staging/~canonical-isd-hackers/canonical-identity-provider/versions-view into lp://staging/canonical-identity-provider/release
Proposed by
Łukasz Czyżykowski
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 72 | ||||
| Proposed branch: | lp://staging/~canonical-isd-hackers/canonical-identity-provider/versions-view | ||||
| Merge into: | lp://staging/canonical-identity-provider/release | ||||
| Diff against target: |
177 lines (+118/-1) 8 files modified
debian/control (+2/-1) debian/rules (+3/-0) identityprovider/__init__.py (+2/-0) identityprovider/templates/versions.html (+27/-0) identityprovider/tests/test_views_versions.py (+33/-0) identityprovider/urls.py (+4/-0) identityprovider/views/versions.py (+39/-0) scripts/update-version (+8/-0) |
||||
| To merge this branch: | bzr merge lp://staging/~canonical-isd-hackers/canonical-identity-provider/versions-view | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Szilveszter Farkas (community) | Approve | ||
| Ricardo Kirkner (community) | Needs Fixing | ||
|
Review via email:
|
|||
To post a comment you must log in.
Revision history for this message
| Szilveszter Farkas (phanatic) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
two small fixes:
l. 114: you committed commented out code
l. 156: django provides you with the django.