Merge lp://qastaging/~unity-team/unity-scope-home/master-scopes into lp://qastaging/unity-scope-home
Proposed by
Paweł Stołowski
| Status: | Merged |
|---|---|
| Approved by: | Michal Hruby |
| Approved revision: | 90 |
| Merged at revision: | 58 |
| Proposed branch: | lp://qastaging/~unity-team/unity-scope-home/master-scopes |
| Merge into: | lp://qastaging/unity-scope-home |
| Diff against target: |
2508 lines (+1590/-396) 23 files modified
configure.ac (+8/-0) data/Makefile.am (+11/-1) data/home.scope.in.in (+3/-6) data/master-scopes/files.scope.in.in (+12/-0) data/master-scopes/info.scope.in.in (+12/-0) data/master-scopes/more_suggestions.scope.in.in (+12/-0) data/master-scopes/music.scope.in.in (+12/-0) data/master-scopes/news.scope.in.in (+12/-0) data/master-scopes/reference.scope.in.in (+12/-0) data/master-scopes/video.scope.in.in (+12/-0) debian/control (+1/-1) src/Makefile.am (+3/-0) src/category-manager.vala (+297/-26) src/master-scopes.vala (+219/-0) src/scope-manager.vala (+6/-0) src/scope.vala (+338/-308) src/smart-scopes-default-parser.vala (+76/-0) src/smart-scopes-interface.vala (+16/-3) src/smart-scopes-more-suggestions-parser.vala (+168/-0) src/smart-scopes-parse.vala (+67/-21) src/smart-scopes-search.vala (+7/-5) tests/unit/Makefile.am (+3/-0) tests/unit/test-home-scope.vala (+283/-25) |
| To merge this branch: | bzr merge lp://qastaging/~unity-team/unity-scope-home/master-scopes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Approve | |
| Michal Hruby (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Create master scopes in home scope. Bugfixes.
Description of the change
Create master scopes in home scope. Bugfixes.
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) | # |
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:87
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http://
Executed test runs:
FAILURE: http://
Click here to trigger a rebuild:
http://