Skip to content

Commit

Permalink
Merged by Peril
Browse files Browse the repository at this point in the history
Removes a potential crash
  • Loading branch information
peril-staging[bot] authored Jul 21, 2018
2 parents fbed484 + d4fb063 commit 90ebb01
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
9 changes: 5 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,11 @@ matrix:
- echo "Validating that danger pr works as expected"
- DEBUG="*" danger pr https://github.com/danger/danger-js/pull/465 --dangerfile dangerfile.circle.js --verbose

- echo "Validating that danger local works as expected"
- git fetch origin master
- git diff master...HEAD
- DEBUG="*" danger local --dangerfile source/platforms/git/_tests/local_dangerfile_example.ts
- echo "Grabbing master so that danger-local can use it for comparison"
- git checkout -t origin/master || true
- '[ ! -z $TRAVIS_PULL_REQUEST ] && DEBUG="*" danger local --dangerfile source/platforms/git/_tests/local_dangerfile_example.ts || echo "Skipping Danger Local for non PR run"'



# Create some fake projects at runtime
- node_js: '7'
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

## Master

* Fixes a crash if lodash isn't a transitive dependency in your node_modules - [@orta][]

# 3.7.20

* Logging / verification improvements for the subprocess - [@orta][]
Expand Down
2 changes: 1 addition & 1 deletion source/platforms/git/diffToGitJSONDSL.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as parseDiff from "parse-diff"
import { includes } from "lodash"
import * as includes from "lodash.includes"
import { GitCommit } from "../../dsl/Commit"
import { GitJSONDSL } from "../../dsl/GitDSL"

Expand Down

0 comments on commit 90ebb01

Please sign in to comment.