Unity 8

Merge lp://staging/~mterry/unity8/no-greeter-drag-if-hidden into lp://staging/unity8

no-greeter-drag-if-hidden
Merge into trunk

Proposed by Michael Terry on 2014-11-21

Status:

Merged

Approved by:

Michael Zanetti on 2014-11-26

Approved revision:

1451

Merged at revision:

1467

Proposed branch:

lp://staging/~mterry/unity8/no-greeter-drag-if-hidden

Merge into:

lp://staging/unity8

Diff against target:

12 lines (+1/-1)

1 file modified

qml/Shell.qml (+1/-1)

To merge this branch:

bzr merge lp://staging/~mterry/unity8/no-greeter-drag-if-hidden

Undecided

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Michael Zanetti (community)		2014-11-21	Approve on 2014-11-26
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2014-11-24
Review via email: mp+242545@code.staging.launchpad.net

Commit message

Don't allow dragging the greeter out from the left edge if it's hidden there.

Description of the change

Don't allow dragging the greeter out from the left edge if it's hidden there.

== 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?
NA

* If you changed the UI, has there been a design review?
NA

lp://staging/~mterry/unity8/no-greeter-drag-if-hidden updated on 2014-11-21

1450. By Michael Terry on 2014-11-21: Don't let user drag greeter out from left edge of screen when it's hidden

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-11-21:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4956/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2014-11-24:

tested, works fine, but...

tags :/

review: Needs Fixing

lp://staging/~mterry/unity8/no-greeter-drag-if-hidden updated on 2014-11-24

1451. By Michael Terry on 2014-11-24: Merge from trunk

Revision history for this message

Michael Terry (mterry) wrote on 2014-11-24:

Try now? I didn't have tags in my local branch. But I merged from trunk, checked again, and pushed again. Maybe this will do the trick.

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2014-11-24:

> Try now? I didn't have tags in my local branch. But I merged from trunk,
> checked again, and pushed again. Maybe this will do the trick.

http://paste.ubuntu.com/9214916/

Revision history for this message

Michael Terry (mterry) wrote on 2014-11-24:

OK, try *now*. I guess fixing locally and pushing doesn't solve it (unless I pass --overwrite). So I pointed the strip script at the remote branch and it cleaned things up.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-11-24:

FAILED: Continuous integration, rev:1451
http://jenkins.qa.ubuntu.com/job/unity8-ci/4962/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/330
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/139
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/127
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/127
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/301
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/330
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/330/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16170