ubuntu-system-settings

Merge lp://qastaging/~michael-sheldon/ubuntu-system-settings/fix-wallpaper-preview into lp://qastaging/ubuntu-system-settings

  1. fix-wallpaper-preview
  2. Merge into trunk
Proposed by Michael Sheldon
Status: Merged
Approved by: Ken VanDine
Approved revision: 1775
Merged at revision: 1775
Proposed branch: lp://qastaging/~michael-sheldon/ubuntu-system-settings/fix-wallpaper-preview
Merge into: lp://qastaging/ubuntu-system-settings
Diff against target: 40 lines (+8/-3)
2 files modified
plugins/background/Preview.qml (+8/-2)
tests/autopilot/ubuntu_system_settings/tests/ofono.py (+0/-1)
To merge this branch: bzr merge lp://qastaging/~michael-sheldon/ubuntu-system-settings/fix-wallpaper-preview
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Approve
Ubuntu Touch System Settings Pending
Review via email: mp+321234@code.qastaging.launchpad.net

Commit message

Stop wallpaper preview overlapping buttons and fix flake8 test.

Description of the change

Stop wallpaper preview overlapping buttons and fix flake8 test.

To post a comment you must log in.
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

PASSED: Continuous integration, rev:1775
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/26/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/2364
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2364
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2181
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2181/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2181
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2181/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2181
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2181/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2181
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2181/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2181
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2181/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2181
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2181/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/26/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches