Merge lp://staging/~jonas-drange/ubuntu-webcatalog/tos-redirect into lp://staging/ubuntu-webcatalog
Proposed by
Jonas G. Drange
| Status: | Merged |
|---|---|
| Approved by: | Jonas G. Drange |
| Approved revision: | 193 |
| Merged at revision: | 190 |
| Proposed branch: | lp://staging/~jonas-drange/ubuntu-webcatalog/tos-redirect |
| Merge into: | lp://staging/ubuntu-webcatalog |
| Diff against target: |
198 lines (+24/-98) 7 files modified
django_project/config/main.cfg (+2/-0) src/webcatalog/schema.py (+2/-0) src/webcatalog/templates/webcatalog/tos.html (+0/-5) src/webcatalog/templates/webcatalog/tos_plain.html (+0/-35) src/webcatalog/templates/webcatalog/tos_snippet.html (+0/-47) src/webcatalog/tests/test_views.py (+13/-6) src/webcatalog/urls.py (+7/-5) |
| To merge this branch: | bzr merge lp://staging/~jonas-drange/ubuntu-webcatalog/tos-redirect |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Martin Albisetti (community) | Approve | ||
|
Review via email:
|
|||
Commit message
redirects terms of service to u1 terms of service
Description of the change
Redirects terms of service to u1 terms of service
cat/tos -> u1/terms
cat/tos/plain -> u1/terms/embedded
To post a comment you must log in.
Revision history for this message
| Martin Albisetti (beuno) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
