krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: merge in develop

Browse Source
This commit is contained in:
Blade Barringer
2016-04-15 10:11:54 -05:00
parent e27bdfef6a
commit 887aa478ec
9 changed files with 67 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tasks/gulp-tests.js
View File

@@ -384,7 +384,6 @@ gulp.task('test:api-v3:integration:separate-server', (done) => {
gulp.task('test', (done) => {
runSequence(
'lint',
'test:common',
'test:api-v3:unit',
'test:api-v3:integration',
@@ -395,7 +394,6 @@ gulp.task('test', (done) => {
gulp.task('test:api-v3', (done) => {
runSequence(
'lint',
'test:api-v3:unit',
'test:api-v3:integration',
done
@@ -448,7 +446,6 @@ gulp.task('test:api-v3:safe', ['test:prepare:server'], (done) => {
gulp.task('test:all', (done) => {
runSequence(
'lint',
//'test:e2e:safe',
//'test:common:safe',
//'test:content:safe',