Merge lp:~online-accounts/ubuntu-system-settings-online-accounts/master into lp:ubuntu-system-settings-online-accounts
Proposed by
Alberto Mardegan
Status: | Merged |
---|---|
Approved by: | David Barth |
Approved revision: | no longer in the source branch. |
Merged at revision: | 224 |
Proposed branch: | lp:~online-accounts/ubuntu-system-settings-online-accounts/master |
Merge into: | lp:ubuntu-system-settings-online-accounts |
Diff against target: |
41 lines (+10/-2) 3 files modified
click-hooks/main.cpp (+1/-0) debian/changelog (+8/-0) plugins/module/OAuth.qml (+1/-2) |
To merge this branch: | bzr merge lp:~online-accounts/ubuntu-system-settings-online-accounts/master |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Online Accounts | Pending | ||
Review via email: mp+247433@code.launchpad.net |
Commit message
Merge from upstream
- Anchor the webview directly to the OSK (LP: #1413765)
- Fix click hook to rebuild service list in the accounts DB
Description of the change
Merge from upstream
- Anchor the webview directly to the OSK (LP: #1413765)
- Fix click hook to rebuild service list in the accounts DB
To post a comment you must log in.
PASSED: Continuous integration, rev:224 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- online- accounts- ci/194/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- vivid-touch/ 962 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- online- accounts- vivid-amd64- ci/16 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- online- accounts- vivid-i386- ci/14 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- vivid-mako/ 853 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 960 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 960/artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 17399
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/ubuntu- system- settings- online- accounts- ci/194/ rebuild
http://