Merge lp:~osomon/webbrowser-app/simplify-historyviewwide into lp:webbrowser-app
Proposed by
Olivier Tilloy
Status: | Merged |
---|---|
Approved by: | Olivier Tilloy |
Approved revision: | 1399 |
Merged at revision: | 1412 |
Proposed branch: | lp:~osomon/webbrowser-app/simplify-historyviewwide |
Merge into: | lp:webbrowser-app |
Diff against target: |
124 lines (+31/-44) 1 file modified
src/app/webbrowser/HistoryViewWide.qml (+31/-44) |
To merge this branch: | bzr merge lp:~osomon/webbrowser-app/simplify-historyviewwide |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Needs Fixing | |
system-apps-ci-bot | continuous-integration | Needs Fixing | |
Ubuntu Phablet Team | Pending | ||
Review via email:
|
Commit message
Simplify the implementation of HistoryViewWide quite a bit,
and as a side effect fix a unit test failure when run against the staging branch of the UITK.
To post a comment you must log in.
FAILED: Continuous integration, rev:1399 /jenkins. canonical. com/system- apps/job/ lp-webbrowser- app-ci/ 289/ /jenkins. canonical. com/system- apps/job/ build/289/ console /jenkins. canonical. com/system- apps/job/ build-0- fetch/289 /jenkins. canonical. com/system- apps/job/ build-1- sourcepkg/ release= vivid+overlay/ 289 /jenkins. canonical. com/system- apps/job/ build-1- sourcepkg/ release= xenial/ 289 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 289/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= xenial/ 289/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 289/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= xenial/ 289/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 289/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= xenial/ 289/console
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild: /jenkins. canonical. com/system- apps/job/ lp-webbrowser- app-ci/ 289/rebuild
https:/