Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-20 22:42:53 -05:00
Code Issues 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 */ /* jscs:disable requireCamelCaseOrUpperCaseIdentifiers */
import Ember from 'ember'; import Ember from 'ember';
import DS from 'ember-data';
import ApplicationSerializer from 'ghost/serializers/application'; import ApplicationSerializer from 'ghost/serializers/application';
import EmbeddedRecordsMixin from 'ember-data/serializers/embedded-records-mixin';
const {EmbeddedRecordsMixin} = DS;
export default ApplicationSerializer.extend(EmbeddedRecordsMixin, { export default ApplicationSerializer.extend(EmbeddedRecordsMixin, {
// settings for the EmbeddedRecordsMixin. // settings for the EmbeddedRecordsMixin.

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

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

2
core/client/package.json
View file

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