Merge lp://staging/~twom/canonical-identity-provider/django-1.10 into lp://staging/canonical-identity-provider/release
Proposed by
Tom Wardill
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~twom/canonical-identity-provider/django-1.10 |
| Merge into: | lp://staging/canonical-identity-provider/release |
| Diff against target: |
2153 lines (+526/-392) 58 files modified
config-manager.txt (+4/-4) django_project/settings_base.py (+30/-28) django_project/settings_devel.py (+5/-5) django_project/settings_test.py (+1/-1) django_project/urls.py (+20/-13) requirements.txt (+3/-4) scripts/generate-random-accounts (+11/-2) src/api/urls.py (+3/-4) src/api/v20/tests/test_decorators.py (+7/-8) src/api/v20/tests/test_handlers.py (+2/-1) src/api/v20/tests/test_login.py (+1/-1) src/api/v20/urls.py (+3/-4) src/identityprovider/admin.py (+16/-14) src/identityprovider/auth.py (+2/-2) src/identityprovider/context_processors.py (+1/-1) src/identityprovider/emailutils.py (+1/-4) src/identityprovider/forms.py (+0/-8) src/identityprovider/models/account.py (+5/-5) src/identityprovider/models/api.py (+1/-1) src/identityprovider/models/emailaddress.py (+2/-3) src/identityprovider/routers.py (+1/-1) src/identityprovider/tests/factory.py (+2/-1) src/identityprovider/tests/helpers.py (+4/-5) src/identityprovider/tests/openid_server/per_version/test_sso_workflow_reset_password.py (+1/-1) src/identityprovider/tests/openid_server/test_basics.py (+1/-2) src/identityprovider/tests/openid_server/test_max_auth_age.py (+1/-1) src/identityprovider/tests/openid_server/test_pre_authorization.py (+1/-2) src/identityprovider/tests/test_admin.py (+2/-5) src/identityprovider/tests/test_apiutils.py (+7/-7) src/identityprovider/tests/test_auth.py (+2/-2) src/identityprovider/tests/test_backend_nop_base.py (+3/-0) src/identityprovider/tests/test_forms.py (+2/-3) src/identityprovider/tests/test_middleware.py (+7/-9) src/identityprovider/tests/test_models_account.py (+7/-2) src/identityprovider/tests/test_models_api.py (+5/-2) src/identityprovider/tests/test_models_emailaddress.py (+2/-2) src/identityprovider/tests/test_routers.py (+4/-1) src/identityprovider/tests/test_views_server.py (+8/-7) src/identityprovider/tests/test_widgets.py (+7/-11) src/identityprovider/tests/utils.py (+4/-1) src/identityprovider/urls.py (+57/-40) src/identityprovider/widgets.py (+7/-11) src/mockservice/sso_mockserver/mockserver.py (+0/-3) src/testing/runner.py (+3/-3) src/ubuntu_sso_saml/tests/test_processors.py (+9/-11) src/ubuntu_sso_saml/tests/urls_deeplink.py (+14/-0) src/ubuntu_sso_saml/tests/urls_deeplink_custom.py (+14/-0) src/ubuntu_sso_saml/tests/urls_deeplinking_fallback.py (+14/-0) src/ubuntu_sso_saml/urls.py (+19/-14) src/ubuntu_sso_saml/views.py (+7/-5) src/webui/decorators.py (+1/-2) src/webui/tests/test_views_account.py (+1/-1) src/webui/tests/test_views_account_ssh.py (+25/-6) src/webui/tests/test_views_registration.py (+5/-3) src/webui/tests/test_views_ui.py (+8/-6) src/webui/urls.py (+147/-100) src/webui/views/errors.py (+5/-6) src/webui/views/registration.py (+1/-3) |
| To merge this branch: | bzr merge lp://staging/~twom/canonical-identity-provider/django-1.10 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu One hackers | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2018-02-20.
Description of the change
Upgrade to django 1.10.
Not intended for landing, just for review before moving on to 1.11.
Some changes around read only fields in the admin and handling of default attributes in forms.
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
