Merge lp:~dobey/pay-service/payui-uitk1.3 into lp:pay-service
Proposed by
dobey
Status: | Merged |
---|---|
Approved by: | Charles Kerr |
Approved revision: | 135 |
Merged at revision: | 102 |
Proposed branch: | lp:~dobey/pay-service/payui-uitk1.3 |
Merge into: | lp:pay-service |
Prerequisite: | lp:~dobey/pay-service/nonus-methods |
Diff against target: |
285 lines (+58/-53) 10 files modified
pay-ui/app/components/AlertDialog.qml (+2/-2) pay-ui/app/components/BeforeUnloadDialog.qml (+2/-2) pay-ui/app/components/ConfirmDialog.qml (+2/-2) pay-ui/app/components/ModalDialog.qml (+3/-3) pay-ui/app/components/PromptDialog.qml (+2/-2) pay-ui/app/components/SecurityCertificatePopover.qml (+4/-4) pay-ui/app/payui.qml (+4/-6) pay-ui/app/ui/CheckoutPage.qml (+18/-18) pay-ui/app/ui/ErrorDialog.qml (+3/-3) pay-ui/app/ui/UbuntuPurchaseWebkit.qml (+18/-11) |
To merge this branch: | bzr merge lp:~dobey/pay-service/payui-uitk1.3 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Charles Kerr (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Review via email: mp+289421@code.launchpad.net |
Commit message
Migrate all usage of Ubuntu.Components to 1.3.
To post a comment you must log in.
FAILED: Continuous integration, rev:128 jenkins. qa.ubuntu. com/job/ pay-service- ci/156/ jenkins. qa.ubuntu. com/job/ pay-service- wily-amd64- ci/86/console jenkins. qa.ubuntu. com/job/ pay-service- wily-armhf- ci/86/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/pay- service- ci/156/ rebuild
http://