Merge lp://staging/~twom/canonical-identity-provider/2fa-qrcode-fix into lp://staging/canonical-identity-provider/release
Proposed by
Tom Wardill
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Tom Wardill | ||||
| Approved revision: | no longer in the source branch. | ||||
| Merge reported by: | Otto Co-Pilot | ||||
| Merged at revision: | not available | ||||
| Proposed branch: | lp://staging/~twom/canonical-identity-provider/2fa-qrcode-fix | ||||
| Merge into: | lp://staging/canonical-identity-provider/release | ||||
| Diff against target: |
91 lines (+37/-5) 3 files modified
src/identityprovider/templatetags/qrcode.py (+6/-3) src/identityprovider/tests/test_templatetags.py (+30/-1) src/webui/tests/test_views_devices.py (+1/-1) |
||||
| To merge this branch: | bzr merge lp://staging/~twom/canonical-identity-provider/2fa-qrcode-fix | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Colin Watson (community) | Approve | ||
| Ricardo Kirkner (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Mark the output of the qrcode template tag as safe.
Description of the change
Mark the output of the qrcode template tag as safe.
Avoids encoding the google url, but the data is quoted explicitly, so should be safe.
Change notice for django:
https:/
Final output of string:
https:/
To post a comment you must log in.
Revision history for this message
| Colin Watson (cjwatson) | # |
review:
Approve
Revision history for this message
| Otto Co-Pilot (otto-copilot) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
LGTM