Skip to content

Commit

Permalink
Merge pull request #54 from escalant3/beta.14
Browse files Browse the repository at this point in the history
Beta.14
  • Loading branch information
pedrokiefer committed Jan 30, 2015
2 parents 4046aa6 + e43a03c commit b31c34c
Show file tree
Hide file tree
Showing 10 changed files with 13 additions and 12 deletions.
6 changes: 3 additions & 3 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "ember-data-tastypie-adapter",
"version": "0.14.0",
"version": "0.15.0",
"private": true,
"dependencies": {
"ember": "~1.8.1",
"ember-data": "1.0.0-beta.11"
"ember": "~1.9.1",
"ember-data": "1.0.0-beta.14"
},
"devDependencies": {
"qunit": "~1.13.0",
Expand Down
2 changes: 1 addition & 1 deletion dist/global/ember-data-tastypie-adapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ define("ember-data-tastypie-adapter/tastypie_serializer",
payload.meta.since = payload.meta[adapter.get('since')];
}

store.metaForType(type, payload.meta);
store.setMetadataFor(type, payload.meta);
delete payload.meta;
}
},
Expand Down
2 changes: 1 addition & 1 deletion dist/global/ember-data-tastypie-adapter.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/global/ember-data-tastypie-adapter.prod.js
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ define("ember-data-tastypie-adapter/tastypie_serializer",
payload.meta.since = payload.meta[adapter.get('since')];
}

store.metaForType(type, payload.meta);
store.setMetadataFor(type, payload.meta);
delete payload.meta;
}
},
Expand Down
2 changes: 1 addition & 1 deletion dist/named-amd/ember-data-tastypie-adapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ define("ember-data-tastypie-adapter/tastypie_serializer",
payload.meta.since = payload.meta[adapter.get('since')];
}

store.metaForType(type, payload.meta);
store.setMetadataFor(type, payload.meta);
delete payload.meta;
}
},
Expand Down
Loading

0 comments on commit b31c34c

Please sign in to comment.