Skip to content
This repository has been archived by the owner on Oct 1, 2019. It is now read-only.

Commit

Permalink
Merge origin/pr/446 into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
indeyets committed Apr 29, 2016
2 parents eb1853a + 37cb478 commit 95f1a6f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
[![Coverage Status](https://coveralls.io/repos/github/Lokiedu/libertysoil-site/badge.svg)](https://coveralls.io/github/Lokiedu/libertysoil-site)

## Requirements

* Redis 3.0
Expand All @@ -22,5 +24,5 @@ Most source files of Libertysoil.org website are made available under the terms
Eastlands Industrial Estate
Leiston
IP16 4US
info@lokieducation.org
info@lokieducation.org
(+44) 17288 31433
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"tasks": "babel-node tasks.js",
"test": "echo \"Preparing test database...\" && babel-node test-helpers/dropDatabase.js && knex --env test migrate:latest && DB_ENV=test mocha test",
"test-old": "echo \"Preparing test database...\" && knex --env test migrate:rollback && knex --env test migrate:latest && DB_ENV=test mocha test",
"travis": "eslint src && echo \"Preparing test database...\" && knex --env travis migrate:latest && DB_ENV=travis mocha test",
"travis": "eslint src && echo \"Preparing test database...\" && knex --env travis migrate:latest && DB_ENV=travis babel-node ./node_modules/istanbul/lib/cli cover _mocha -- -R spec && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage",
"start": "NODE_ENV=development babel-node --source-maps -- index.js",
"docker-start": "knex migrate:latest && NODE_ENV=production npm run webpack:build:prod && NODE_ENV=production babel-node index.js",
"lint": "eslint src",
Expand Down Expand Up @@ -118,6 +118,7 @@
"browser-sync": "^2.8.2",
"checkit": "^0.6.0",
"cookie": "^0.2.3",
"coveralls": "^2.11.9",
"css-loader": "^0.23.1",
"csv": "^0.4.6",
"eslint": "^2.6.0",
Expand Down

0 comments on commit 95f1a6f

Please sign in to comment.