diff options
author | Kevin Serrano <kevin.serrano@consensys.net> | 2017-10-06 08:06:55 +0800 |
---|---|---|
committer | Kevin Serrano <kevin.serrano@consensys.net> | 2017-10-06 08:06:55 +0800 |
commit | b9012a62e5df372a9cd5309e345b5f5ff0230e38 (patch) | |
tree | 553578318e7e067bdb619abb346957ab48e377b7 /gulpfile.js | |
parent | bb9c2b3563938832e4b35b6623ef724017093fcb (diff) | |
parent | 53da368d2370edbb78eca063ff701c0492abbff6 (diff) | |
download | tangerine-wallet-browser-b9012a62e5df372a9cd5309e345b5f5ff0230e38.tar tangerine-wallet-browser-b9012a62e5df372a9cd5309e345b5f5ff0230e38.tar.gz tangerine-wallet-browser-b9012a62e5df372a9cd5309e345b5f5ff0230e38.tar.bz2 tangerine-wallet-browser-b9012a62e5df372a9cd5309e345b5f5ff0230e38.tar.lz tangerine-wallet-browser-b9012a62e5df372a9cd5309e345b5f5ff0230e38.tar.xz tangerine-wallet-browser-b9012a62e5df372a9cd5309e345b5f5ff0230e38.tar.zst tangerine-wallet-browser-b9012a62e5df372a9cd5309e345b5f5ff0230e38.zip |
Merge branch 'master' into version-debugging
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 ac36cf983..557b58a68 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). |