Merge lp://qastaging/~osomon/webbrowser-app/blacklist-download-flash-videos into lp://qastaging/webbrowser-app
Proposed by
Olivier Tilloy
Status: | Merged |
---|---|
Approved by: | Olivier Tilloy |
Approved revision: | 764 |
Merged at revision: | 775 |
Proposed branch: | lp://qastaging/~osomon/webbrowser-app/blacklist-download-flash-videos |
Merge into: | lp://qastaging/webbrowser-app |
Diff against target: |
23 lines (+12/-0) 1 file modified
src/app/WebViewImpl.qml (+12/-0) |
To merge this branch: | bzr merge lp://qastaging/~osomon/webbrowser-app/blacklist-download-flash-videos |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alexandre Abreu (community) | Approve | ||
PS Jenkins bot | continuous-integration | Needs Fixing | |
Review via email:
|
Commit message
Prevent the browser from trying to download embedded flash applications.
To post a comment you must log in.
FAILED: Continuous integration, rev:764 jenkins. qa.ubuntu. com/job/ webbrowser- app-ci/ 1193/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- utopic- touch/5931 jenkins. qa.ubuntu. com/job/ generic- mediumtests- utopic/ 4083 jenkins. qa.ubuntu. com/job/ webbrowser- app-utopic- amd64-ci/ 392 jenkins. qa.ubuntu. com/job/ webbrowser- app-utopic- armhf-ci/ 392 jenkins. qa.ubuntu. com/job/ webbrowser- app-utopic- armhf-ci/ 392/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ webbrowser- app-utopic- i386-ci/ 392 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- mako/5573 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/7183 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/7183/ artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 14666 jenkins. qa.ubuntu. com/job/ autopilot- testrunner- otto-utopic/ 3445 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- amd64/4412 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- amd64/4412/ artifact/ work/output/ *zip*/output. zip
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/webbrowser- app-ci/ 1193/rebuild
http://