Ubuntu File Manager App

Merge lp://staging/~nskaggs/ubuntu-filemanager-app/revert-r209 into lp://staging/ubuntu-filemanager-app

  1. revert-r209
  2. Merge into trunk
Proposed by Nicholas Skaggs
Status: Merged
Approved by: Nicholas Skaggs
Approved revision: 213
Merged at revision: 211
Proposed branch: lp://staging/~nskaggs/ubuntu-filemanager-app/revert-r209
Merge into: lp://staging/ubuntu-filemanager-app
Diff against target: 734 lines (+104/-401)
15 files modified
debian/control (+1/-12)
debian/qtdeclarative5-placesmodel0.1.install (+0/-1)
src/app/qml/components/PathBar.qml (+1/-1)
src/app/qml/components/PlacesSidebar.qml (+36/-13)
src/app/qml/filemanager.qml (+2/-7)
src/app/qml/ui/FolderListPage.qml (+28/-15)
src/app/qml/ui/PlacesPopover.qml (+35/-2)
src/plugin/CMakeLists.txt (+0/-1)
src/plugin/placesmodel/CMakeLists.txt (+0/-35)
src/plugin/placesmodel/placesmodel.cpp (+0/-174)
src/plugin/placesmodel/placesmodel.h (+0/-64)
src/plugin/placesmodel/placesmodel_plugin.cpp (+0/-34)
src/plugin/placesmodel/placesmodel_plugin.h (+0/-39)
src/plugin/placesmodel/qmldir (+0/-2)
tests/autopilot/filemanager/tests/test_places.py (+1/-1)
To merge this branch: bzr merge lp://staging/~nskaggs/ubuntu-filemanager-app/revert-r209
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Ubuntu File Manager Developers Pending
Review via email: mp+223783@code.staging.launchpad.net

Commit message

Revert accidental merge

Description of the change

Revert accidental merge of https://code.launchpad.net/~dpm/ubuntu-filemanager-app/placesmodel/+merge/223548

To post a comment you must log in.
lp://staging/~nskaggs/ubuntu-filemanager-app/revert-r209 updated
213. By Nicholas Skaggs

also revert test_places ap change

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:212
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/261/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/581
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/581/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/59

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/261/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:213
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/262/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/582
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/582/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/60

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/262/rebuild

review: Approve (continuous-integration)
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Ran 22 tests in 495.191s
OK

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