Skip to content

Commit

Permalink
Merge branch 'major-updates'
Browse files Browse the repository at this point in the history
  • Loading branch information
jdalrymple committed Jul 25, 2017
2 parents 308e07e + 8450421 commit 5d54b5e
Show file tree
Hide file tree
Showing 20 changed files with 5,917 additions and 1,179 deletions.
3 changes: 2 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
},
"extends": "airbnb",
rules:{
arrow-body-style: [2, "as-needed"]
arrow-body-style: [2, "as-needed"],
no-await-in-loop: [1]
}
}
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ test-repositories/
results/
node_modules/
coverage/
venv/
venv/
./nyc_output
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "utils/gitifyhg"]
path = utils/gitifyhg
[submodule "libs/gitifyhg"]
path = libs/gitifyhg
url = https://github.com/jdalrymple/gitifyhg.git
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
language: node_js
node_js:
- "node"
- "6"
- "6.0.0"

- "7.6"
- "7"
- "8"
before_install:
- sudo apt-get update
- sudo apt-get install python2.7
- sudo pip install -q https://www.mercurial-scm.org/release/mercurial-4.0.tar.gz
- cd utils/gitifyhg/
- cd libs/gitifyhg/
- sudo python2.7 setup.py install
- cd $TRAVIS_BUILD_DIR

Expand Down
Loading

0 comments on commit 5d54b5e

Please sign in to comment.