Merge lp:~3v1n0/unity/shutdown-dialog-nolock-on-lockscreen into lp:unity
Proposed by
Marco Trevisan (Treviño)
Status: | Merged |
---|---|
Approved by: | Marco Trevisan (Treviño) |
Approved revision: | no longer in the source branch. |
Merged at revision: | 3992 |
Proposed branch: | lp:~3v1n0/unity/shutdown-dialog-nolock-on-lockscreen |
Merge into: | lp:unity |
Diff against target: |
12 lines (+1/-1) 1 file modified
shutdown/SessionView.cpp (+1/-1) |
To merge this branch: | bzr merge lp:~3v1n0/unity/shutdown-dialog-nolock-on-lockscreen |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andrea Azzarone (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Review via email: mp+263449@code.launchpad.net |
Commit message
SessionView: don't show Lock button if session is currently locked
To post a comment you must log in.
FAILED: Continuous integration, rev:3984 jenkins. qa.ubuntu. com/job/ unity-ci/ 1255/ jenkins. qa.ubuntu. com/job/ unity-wily- amd64-ci/ 33 jenkins. qa.ubuntu. com/job/ unity-wily- armhf-ci/ 31 jenkins. qa.ubuntu. com/job/ unity-wily- i386-ci/ 31/console
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity- ci/1255/ rebuild
http://