TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-01 22:02:11 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6619 from kevinansfield/ember-data-2-4-2

Browse Source 
deps: ember-data@2.4.2
This commit is contained in:
Jason Williams 2016-03-21 13:31:03 -05:00
commit 82b0b92b73
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/client/app/serializers/post.js
View File

@ -1,9 +1,7 @@
/* jscs:disable requireCamelCaseOrUpperCaseIdentifiers */
import Ember from 'ember';
import DS from 'ember-data';
import ApplicationSerializer from 'ghost/serializers/application';
const {EmbeddedRecordsMixin} = DS;
import EmbeddedRecordsMixin from 'ember-data/serializers/embedded-records-mixin';
export default ApplicationSerializer.extend(EmbeddedRecordsMixin, {
// settings for the EmbeddedRecordsMixin.

4
core/client/app/serializers/user.js
View File

@ -1,8 +1,6 @@
import Ember from 'ember';
import DS from 'ember-data';
import ApplicationSerializer from 'ghost/serializers/application';
const {EmbeddedRecordsMixin} = DS;
import EmbeddedRecordsMixin from 'ember-data/serializers/embedded-records-mixin';
export default ApplicationSerializer.extend(EmbeddedRecordsMixin, {
attrs: {

2
core/client/package.json
View File

@ -37,7 +37,7 @@
"ember-cli-selectize": "0.4.3",
"ember-cli-sri": "2.1.0",
"ember-cli-uglify": "1.2.0",
"ember-data": "2.4.0",
"ember-data": "2.4.2",
"ember-data-filter": "1.13.0",
"ember-disable-proxy-controllers": "1.0.1",
"ember-export-application-global": "1.0.5",