Skip to content

Commit

Permalink
Merge pull request #412 from rwjblue/pin-ember-data
Browse files Browse the repository at this point in the history
Work downstream dependencies dropping Node 4 without major bump.
  • Loading branch information
rwjblue authored Sep 26, 2018
2 parents 48e98d7 + b91956e commit 32d81de
Show file tree
Hide file tree
Showing 2 changed files with 1,933 additions and 836 deletions.
8 changes: 6 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"ember-cli-pretender": "^1.0.1",
"ember-cli-shims": "^1.2.0",
"ember-cli-test-loader": "^2.2.0",
"ember-data": "~3.1.1",
"ember-data": "3.1.1",
"ember-debug-handlers-polyfill": "^1.0.3",
"ember-disable-prototype-extensions": "^1.1.2",
"ember-fetch": "^3.4.0",
Expand All @@ -56,7 +56,7 @@
"ember-resolver": "^4.0.0",
"ember-source": "~3.1.0",
"ember-source-channel-url": "^1.0.1",
"ember-try": "^1.0.0-beta.1",
"ember-try": "1.0.0-beta.1",
"eslint-config-prettier": "^2.6.0",
"eslint-plugin-disable-features": "^0.1.3",
"eslint-plugin-node": "^6.0.1",
Expand Down Expand Up @@ -84,5 +84,9 @@
},
"ember-addon": {
"configPath": "tests/dummy/config"
},
"resolutions": {
"**/sane": "^2.5.2",
"ember-cli/testem": "~2.6.0"
}
}
Loading

0 comments on commit 32d81de

Please sign in to comment.