Skip to content

Commit

Permalink
Merge remote-tracking branch 'trystant/master' into feature/merge-try…
Browse files Browse the repository at this point in the history
…stant-master

* trystant/master: (28 commits)
  Updated Postgres system requirement for #22
  Updated README.md installation process
  Updated README.md with testing info
  Updated README to remove supertest
  Added codeclimate test coverage badge; #20
  Changed Markdown version to HTML for README.md #20
  Updated README.md and removed unused code; #20
  Changed lcov.info location for code climate;  #20
  Added commands to generate lcov data; #20
  Added config variables to help test coverage; #20
  Added istanbul & configured for test coverage; #20
  Added Code Climate badge; #20
  Added CodeClimate badge to the README.md; #20
  Remove console.log from AccountSpec; #10
  Added diagnostics to account spec #10
  Changed "127.0.0.1" to "localhost"; #10
  Manually create database; #10
  Quoted replacement values
  Changed echo to cat #10
  Updated script to show template output; #10
  ...

# Conflicts:
#	.travis.yml
#	README.md
#	app.js
#	config/config.json.tmpl
#	models/Account.js
#	package.json
  • Loading branch information
asbjornu committed Apr 15, 2016
2 parents 9cfa2f7 + a39d730 commit 0781be5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ sudo: false
env:
- CXX=g++-4.8 NODE_ENV=test
node_js:
- "5.5.0"
- "4.2"
- "4.1"
- "4.0"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ order to keep the app ready to use at all times.

You need [Node.js](http://nodejs.org/download/) and a Relational Database
Management System such as [Postgres](http://www.postgresql.org/download)
installed and running.
9.3 or higher installed and running.

We use [`bcrypt`](https://github.com/ncb000gt/node.bcrypt.js) for hashing
secrets. If you have issues during installation related to `bcrypt` then [refer
Expand Down

0 comments on commit 0781be5

Please sign in to comment.