Reviewers: mp+141923_code.launchpad.net, Message: Please take a look.
Description: Removed no longer needed workaround. The file app/models/charm.js was added explicitly in bin/merge-files. Apparently this workaround is no longer required: the file is correctly collected by lib/merge-files.js:readdir. https://code.launchpad.net/~frankban/juju-gui/bug-1090563-merge-files/+merge/141923 (do not edit description out of merge proposal) Please review this at https://codereview.appspot.com/7033053/ Affected files: A [revision details] M bin/merge-files Index: [revision details] === added file '[revision details]' --- [revision details] 2012-01-01 00:00:00 +0000 +++ [revision details] 2012-01-01 00:00:00 +0000 @@ -0,0 +1,2 @@ +Old revision: [email protected] +New revision: [email protected] Index: bin/merge-files === modified file 'bin/merge-files' --- bin/merge-files 2012-12-20 21:59:21 +0000 +++ bin/merge-files 2013-01-04 13:48:14 +0000 @@ -48,8 +48,6 @@ // templates.js is a generated file. It is not part of the app directory. paths.push(syspath.join(process.cwd(), 'build-shared/juju-ui/templates.js')); - // XXX Why do we have to do this? (bug 1090563). - paths.push(syspath.join(process.cwd(), 'app/models/charm.js')); merge.combineJs(paths, 'build-shared/juju-ui/assets/app.js'); -- https://code.launchpad.net/~frankban/juju-gui/bug-1090563-merge-files/+merge/141923 Your team Juju GUI Hackers is requested to review the proposed merge of lp:~frankban/juju-gui/bug-1090563-merge-files into lp:juju-gui. -- Mailing list: https://launchpad.net/~yellow Post to : [email protected] Unsubscribe : https://launchpad.net/~yellow More help : https://help.launchpad.net/ListHelp
