Merge lp://staging/webbrowser-app/staging into lp://staging/webbrowser-app
Proposed by
Olivier Tilloy
Status: | Merged |
---|---|
Merged at revision: | 1560 |
Proposed branch: | lp://staging/webbrowser-app/staging |
Merge into: | lp://staging/webbrowser-app |
Diff against target: |
2840 lines (+1499/-148) 63 files modified
.bzrignore (+0/-2) debian/control (+7/-2) debian/rules (+1/-1) snapcraft.yaml (+8/-16) src/Ubuntu/Web/ua-overrides-desktop.js.in (+9/-0) src/Ubuntu/Web/ua-overrides-mobile.js.in (+3/-0) src/app/ChromeBase.qml (+1/-0) src/app/webbrowser/Browser.qml (+158/-29) src/app/webbrowser/BrowserTab.qml (+19/-2) src/app/webbrowser/CMakeLists.txt (+2/-0) src/app/webbrowser/Chrome.qml (+12/-2) src/app/webbrowser/ContextMenuMobile.qml (+10/-2) src/app/webbrowser/Suggestions.qml (+1/-1) src/app/webbrowser/TabComponent.qml (+33/-15) src/app/webbrowser/TabItem.qml (+2/-2) src/app/webbrowser/TabsBar.qml (+112/-15) src/app/webbrowser/TabsList.qml (+2/-2) src/app/webbrowser/drag-helper.cpp (+203/-0) src/app/webbrowser/drag-helper.h (+91/-0) src/app/webbrowser/reparenter.cpp (+124/-0) src/app/webbrowser/reparenter.h (+46/-0) src/app/webbrowser/webbrowser-app.cpp (+6/-0) src/app/webbrowser/webbrowser-app.qml (+33/-3) src/app/webcontainer/ContextMenuMobile.qml (+10/-2) src/app/webcontainer/WebappWebview.qml (+5/-4) tests/autopilot/webbrowser_app/emulators/browser.py (+7/-1) tests/autopilot/webbrowser_app/tests/__init__.py (+40/-7) tests/autopilot/webbrowser_app/tests/test_downloads.py (+62/-10) tests/autopilot/webbrowser_app/tests/test_history.py (+30/-4) tests/autopilot/webbrowser_app/tests/test_multiple_windows.py (+222/-0) tests/autopilot/webbrowser_app/tests/test_new_tab_view.py (+10/-0) tests/unittests/bookmarks-folder-model/CMakeLists.txt (+1/-1) tests/unittests/bookmarks-folderlist-model/CMakeLists.txt (+1/-1) tests/unittests/bookmarks-model/CMakeLists.txt (+1/-1) tests/unittests/container-url-patterns/CMakeLists.txt (+1/-1) tests/unittests/cookie-store/CMakeLists.txt (+1/-1) tests/unittests/domain-utils/CMakeLists.txt (+1/-1) tests/unittests/downloads-model/CMakeLists.txt (+1/-1) tests/unittests/favicon-fetcher/CMakeLists.txt (+1/-1) tests/unittests/history-domain-model/CMakeLists.txt (+1/-1) tests/unittests/history-domainlist-model/CMakeLists.txt (+1/-1) tests/unittests/history-lastvisitdatelist-model/CMakeLists.txt (+1/-1) tests/unittests/history-model/CMakeLists.txt (+1/-1) tests/unittests/intent-filter/CMakeLists.txt (+1/-1) tests/unittests/limit-proxy-model/CMakeLists.txt (+1/-1) tests/unittests/meminfo/CMakeLists.txt (+1/-1) tests/unittests/oxide-cookie-helper/CMakeLists.txt (+1/-1) tests/unittests/qml/CMakeLists.txt (+2/-0) tests/unittests/qml/ReparenterFakeContainer.qml (+40/-0) tests/unittests/qml/ReparenterFakeTab.qml (+37/-0) tests/unittests/qml/tst_BrowserTab.qml (+3/-2) tests/unittests/qml/tst_QmlTests.cpp (+7/-0) tests/unittests/qml/tst_Reparenter.qml (+114/-0) tests/unittests/qml/tst_TabsBar.qml (+2/-0) tests/unittests/qml/tst_UbuntuWebView02.qml (+1/-0) tests/unittests/search-engine/CMakeLists.txt (+1/-1) tests/unittests/session-storage/CMakeLists.txt (+1/-1) tests/unittests/session-utils/CMakeLists.txt (+1/-1) tests/unittests/single-instance-manager/CMakeLists.txt (+1/-1) tests/unittests/tabs-model/CMakeLists.txt (+1/-1) tests/unittests/text-search-filter-model/CMakeLists.txt (+1/-1) tests/unittests/webapp-container-color-helper/CMakeLists.txt (+1/-1) tests/unittests/webapp-container-hook/CMakeLists.txt (+1/-1) |
To merge this branch: | bzr merge lp://staging/webbrowser-app/staging |
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
system-apps-ci-bot | continuous-integration | Needs Fixing | |
Ubuntu Phablet Team | Pending | ||
Review via email:
|
Commit message
TEST - DO NOT MERGE!
To post a comment you must log in.
FAILED: Continuous integration, rev:1574 /jenkins. canonical. com/system- apps/job/ lp-webbrowser- app-ci/ 722/ /jenkins. canonical. com/system- apps/job/ build/1931/ console /jenkins. canonical. com/system- apps/job/ build-0- fetch/1932 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 1771 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 1771/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 1771/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= zesty/1771 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= zesty/1771/ artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 1771 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 1771/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 1771/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= zesty/1771 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= zesty/1771/ artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 1771 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 1771/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 1771/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= zesty/1771 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= zesty/1771/ artifact/ output/ *zip*/output. zip
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild: /jenkins. canonical. com/system- apps/job/ lp-webbrowser- app-ci/ 722/rebuild
https:/