Merge lp://qastaging/~mhr3/unity-scope-home/use-server-order into lp://qastaging/unity-scope-home
Proposed by
Michal Hruby
Status: | Merged |
---|---|
Approved by: | Paweł Stołowski |
Approved revision: | 100 |
Merged at revision: | 91 |
Proposed branch: | lp://qastaging/~mhr3/unity-scope-home/use-server-order |
Merge into: | lp://qastaging/unity-scope-home |
Prerequisite: | lp://qastaging/~stolowski/unity-scope-home/reorder-delay |
Diff against target: |
174 lines (+44/-19) 5 files modified
src/category-manager.vala (+16/-2) src/scope.vala (+12/-3) src/search-util.vala (+0/-2) src/smart-scopes-interface.vala (+2/-2) src/smart-scopes-search.vala (+14/-10) |
To merge this branch: | bzr merge lp://qastaging/~mhr3/unity-scope-home/use-server-order |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Paweł Stołowski (community) | Approve | ||
Review via email:
|
Commit message
Convert scope ids to master scope ids when calculating recommended order.
Description of the change
Convert scope ids to master scope ids when calculating recommended order. Plus a few other fixes.
To post a comment you must log in.
PASSED: Continuous integration, rev:99 jenkins. qa.ubuntu. com/job/ unity-scope- home-ci/ 13/ jenkins. qa.ubuntu. com/job/ unity-scope- home-raring- amd64-ci/ 15
http://
Executed test runs:
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ unity-scope- home-ci/ 13/rebuild
http://