diff options
author | Dan Finlay <dan@danfinlay.com> | 2017-10-13 00:59:28 +0800 |
---|---|---|
committer | Dan Finlay <dan@danfinlay.com> | 2017-10-13 01:25:19 +0800 |
commit | d0d082d70c1e256aeb70f90fcdc864aeca00aed4 (patch) | |
tree | a487d9bb888eebeba9c68d570cc55a5541384451 /gulpfile.js | |
parent | 1cba6543a42561c6691736d58f45e97f4832912b (diff) | |
parent | 29ee33359e818525549b5241adb6f5903a054bba (diff) | |
download | tangerine-wallet-browser-d0d082d70c1e256aeb70f90fcdc864aeca00aed4.tar.gz tangerine-wallet-browser-d0d082d70c1e256aeb70f90fcdc864aeca00aed4.tar.zst tangerine-wallet-browser-d0d082d70c1e256aeb70f90fcdc864aeca00aed4.zip |
Merge branch 'master' into i1340-SynchronousInjection
Diffstat (limited to 'gulpfile.js')
-rw-r--r-- | gulpfile.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gulpfile.js b/gulpfile.js index 14e26ed2e..6d2ff5fdd 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -151,7 +151,7 @@ gulp.task('copy:watch', function(){ gulp.task('lint', function () { // Ignoring node_modules, dist/firefox, and docs folders: - return gulp.src(['app/**/*.js', 'ui/**/*.js', '!node_modules/**', '!dist/firefox/**', '!docs/**', '!app/scripts/chromereload.js']) + return gulp.src(['app/**/*.js', 'ui/**/*.js', 'mascara/src/*.js', 'mascara/server/*.js', '!node_modules/**', '!dist/firefox/**', '!docs/**', '!app/scripts/chromereload.js', '!mascara/test/jquery-3.1.0.min.js']) .pipe(eslint(fs.readFileSync(path.join(__dirname, '.eslintrc')))) // eslint.format() outputs the lint results to the console. // Alternatively use eslint.formatEach() (see Docs). |