Merge lp:~mterry/unity8/expose-lockscreen-passphrase into lp:unity8
Status: | Merged |
---|---|
Approved by: | Michał Sawicz |
Approved revision: | 1370 |
Merged at revision: | 1392 |
Proposed branch: | lp:~mterry/unity8/expose-lockscreen-passphrase |
Merge into: | lp:unity8 |
Diff against target: |
51 lines (+12/-0) 4 files modified
debian/changelog (+6/-0) qml/Components/Lockscreen.qml (+2/-0) qml/Components/PassphraseLockscreen.qml (+2/-0) qml/Components/PinLockscreen.qml (+2/-0) |
To merge this branch: | bzr merge lp:~mterry/unity8/expose-lockscreen-passphrase |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michał Sawicz | Approve | ||
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Review via email: mp+239364@code.launchpad.net |
Commit message
Expose a 'passphrase' field of Components.
I know that passphrase isn't the *best* field name, considering it works for a passcode too. But we already expose that phrase for both in the accepted() signal. So for consistency, I kept it the same.
And I bumped the unity8 version, so that ubuntu-
Description of the change
Expose a 'passphrase' field of Components.
I know that passphrase isn't the *best* field name, considering it works for a passcode too. But we already expose that phrase for both in the accepted() signal. So for consistency, I kept it the same.
And I bumped the unity8 version, so that ubuntu-
== Checklist ==
* Are there any related MPs required for this MP to build/function as expected? Please list.
No
* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes
* Did you make sure that your branch does not contain spurious tags?
Yes
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
I am in that team
* If you changed the UI, has there been a design review?
NA
FAILED: Continuous integration, rev:1370 jenkins. qa.ubuntu. com/job/ unity8- ci/4751/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- utopic- touch/6171/ console jenkins. qa.ubuntu. com/job/ unity-phablet- qmluitests- utopic/ 1737 jenkins. qa.ubuntu. com/job/ unity8- utopic- amd64-ci/ 1847 jenkins. qa.ubuntu. com/job/ unity8- utopic- i386-ci/ 1845 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- mako/5794/ console jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/7423 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/7423/ artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 15006
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity8- ci/4751/ rebuild
http://