diff --git a/.travis.yml b/.travis.yml index 3930fd57f83..033036f8dff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,8 @@ branches: - master - beta - release + # prior release branches + - /^release-\d+-\d+/ # npm version tags - /^v\d+\.\d+\.\d+/ diff --git a/addon/-private/system/relationships/state/relationship.js b/addon/-private/system/relationships/state/relationship.js index fc9477c6a84..6286c60cf75 100644 --- a/addon/-private/system/relationships/state/relationship.js +++ b/addon/-private/system/relationships/state/relationship.js @@ -507,7 +507,7 @@ export default class Relationship { this.store._updateRelationshipState(this); } - updateLink(link, initial) { + updateLink(link) { heimdall.increment(updateLink); warn( `You pushed a record of type '${this.internalModel.modelName}' with a relationship '${ @@ -528,10 +528,6 @@ export default class Relationship { this.link = link; this.fetchPromise = null; this.setRelationshipIsStale(true); - - if (!initial) { - this.internalModel.notifyPropertyChange(this.key); - } } reload() { @@ -693,7 +689,7 @@ export default class Relationship { let relatedLink = _normalizeLink(payload.links.related); if (relatedLink && relatedLink.href && relatedLink.href !== this.link) { hasLink = true; - this.updateLink(relatedLink.href, initial); + this.updateLink(relatedLink.href); } } @@ -721,6 +717,10 @@ export default class Relationship { this.setRelationshipIsEmpty(relationshipIsEmpty); } else if (hasLink) { this.setRelationshipIsStale(true); + + if (!initial) { + this.internalModel.notifyPropertyChange(this.key); + } } }