Merge lp:~stephen-stewart/snapweb/installed-only into lp:~snappy-dev/snapweb/trunk

Proposed by Stephen Stewart
Status: Merged
Merged at revision: 133
Proposed branch: lp:~stephen-stewart/snapweb/installed-only
Merge into: lp:~snappy-dev/snapweb/trunk
Diff against target: 22 lines (+1/-2)
2 files modified
www/src/js/config.js (+1/-1)
www/src/js/controllers/home.js (+0/-1)
To merge this branch: bzr merge lp:~stephen-stewart/snapweb/installed-only
Reviewer Review Type Date Requested Status
Sergio Schvezov Approve
Review via email: mp+258559@code.launchpad.net

Commit message

missing backslash, installed only works!

To post a comment you must log in.
Revision history for this message
Sergio Schvezov (sergiusens) :
review: Approve
Revision history for this message
Snappy Tarmac (snappydevtarmac) wrote :

The attempt to merge lp:~stephen-stewart/webdm/installed-only into lp:webdm failed. Below is the output from the failed tests.

# we always run in a fresh dir in tarmac
export GOPATH=$(mktemp -d)
mktemp: failed to create directory via template ‘~/tmp/tmp.XXXXXXXXXX’: No such file or directory
trap 'rm -rf "$GOPATH"' EXIT

# this is a hack, but not sure tarmac is golang friendly
mkdir -p $GOPATH/src/launchpad.net/webdm
mkdir: cannot create directory ‘/src’: Permission denied

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'www/src/js/config.js'
--- www/src/js/config.js 2015-04-30 10:07:40 +0000
+++ www/src/js/config.js 2015-05-07 20:47:26 +0000
@@ -1,5 +1,5 @@
1module.exports = {1module.exports = {
2 PACKAGES: '/api/v2/packages',2 PACKAGES: '/api/v2/packages/',
3 SETTINGS: '/api/v2/packages/ubuntu-core',3 SETTINGS: '/api/v2/packages/ubuntu-core',
4 FILTERED_SNAPS: [4 FILTERED_SNAPS: [
5 'webdm',5 'webdm',
66
=== modified file 'www/src/js/controllers/home.js'
--- www/src/js/controllers/home.js 2015-04-24 11:15:41 +0000
+++ www/src/js/controllers/home.js 2015-05-07 20:47:26 +0000
@@ -13,7 +13,6 @@
1313
14 installedBask.fetch({14 installedBask.fetch({
15 data: $.param({15 data: $.param({
16 'types': ['app'],
17 'installed_only': true16 'installed_only': true
18 }),17 }),
19 success: function(snaplist) {18 success: function(snaplist) {

Subscribers

People subscribed via source and target branches