Merge lp:~dobey/ubuntu-sso-client/update-3-0 into lp:ubuntu-sso-client/stable-3-0
Proposed by
dobey
| Status: | Merged |
|---|---|
| Approved by: | dobey |
| Approved revision: | 840 |
| Merged at revision: | 840 |
| Proposed branch: | lp:~dobey/ubuntu-sso-client/update-3-0 |
| Merge into: | lp:ubuntu-sso-client/stable-3-0 |
| Diff against target: |
204 lines (+93/-8) 8 files modified
ubuntu_sso/gtk/gui.py (+18/-0) ubuntu_sso/gtk/tests/test_gui.py (+7/-0) ubuntu_sso/main/linux.py (+6/-1) ubuntu_sso/main/tests/test_linux.py (+59/-0) ubuntu_sso/qt/current_user_sign_in_page.py (+1/-3) ubuntu_sso/qt/setup_account_page.py (+0/-1) ubuntu_sso/qt/tests/test_current_user_sign_in_page.py (+1/-1) ubuntu_sso/qt/tests/test_setup_account.py (+1/-2) |
| To merge this branch: | bzr merge lp:~dobey/ubuntu-sso-client/update-3-0 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Roberto Alsina (community) | Approve | ||
| Brian Curtin (community) | Approve | ||
|
Review via email:
|
|||
Commit message
[Rodney Dawes]
Ensure we are using strict ssl with the system ca-certificates.crt file
Trap DBusException when getting the SessionBus, and add a test case for it
[Roberto Alsina]
Remove back buttons in signin/signup pages (Fixes LP:1009107).
To post a comment you must log in.
Revision history for this message
| Brian Curtin (brian.curtin) | # |
review:
Approve
Revision history for this message
| Roberto Alsina (ralsina) | # |
review:
Approve
Revision history for this message
| Ubuntu One Auto Pilot (otto-pilot) wrote | # |
Revision history for this message
| Ubuntu One Auto Pilot (otto-pilot) wrote | # |
Download full text (155.1 KiB)
The attempt to merge lp:~dobey/ubuntu-sso-client/update-3-0 into lp:ubuntu-sso-client/stable-3-0 failed. Below is the output from the failed tests.