Merge lp://staging/~bloodearnest/canonical-identity-provider/1174917 into lp://staging/canonical-identity-provider/release
Proposed by
Simon Davy
| Status: | Merged |
|---|---|
| Approved by: | Ricardo Kirkner |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 887 |
| Proposed branch: | lp://staging/~bloodearnest/canonical-identity-provider/1174917 |
| Merge into: | lp://staging/canonical-identity-provider/release |
| Diff against target: |
289 lines (+110/-29) 7 files modified
api/v20/handlers.py (+9/-3) api/v20/tests/test_registration.py (+47/-5) api/v20/utils.py (+2/-0) docs/resources/account.txt (+12/-0) identityprovider/models/captcha.py (+22/-10) identityprovider/tests/test_captcha.py (+17/-10) requirements/config-manager.txt (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~bloodearnest/canonical-identity-provider/1174917 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ricardo Kirkner (community) | Approve | ||
| Michael Foord (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Fix for #1174917 - expose recaptcha service problems via api, rather than
pretending it failed.
Description of the change
Fix for #1174917 - expose recaptcha service problems via api, rather than
pretending it failed.
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
LGTM