Skip to content

Igor/rollback delete#2

Merged
nhan merged 1 commit intomasterfrom
igor/rollback_delete
Jun 17, 2013
Merged

Igor/rollback delete#2
nhan merged 1 commit intomasterfrom
igor/rollback_delete

Conversation

@igorT
Copy link

@igorT igorT commented Jun 14, 2013

No description provided.

store.dematerializeRecord(record);
},

rollback: Ember.K,

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

4 commits end with one line change?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No idea, seems like rebase/git weirdness

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So, are there more changes we should look at then just this line? If so, is there a way you can create a diff that shows that?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, thats the only line I changed.

@nhan
Copy link

nhan commented Jun 17, 2013

lgtm

@nhan nhan merged commit 8e55ff7 into master Jun 17, 2013
igorT pushed a commit that referenced this pull request May 12, 2014
Prefix built-in serializers and adapters with a dash.
mmun pushed a commit that referenced this pull request Apr 26, 2023
* Fix lint error

* Fix `_requireBuildPackages` error

* Reset yarn.lock from master

There seems to be some issues in the yarn.lock

To solve them I ran:
- `git checkout master yarn.lock`
- `yarn`

Throw an error in case of dependency mismatch (#2)

* Throw an error in case of dependency mismatch

An app (or addon) that consumes ember-data should have:
- either jquery
- or ember-fetch version 6.0.0 or above

Throw a build error if it's not the case.

* Remove ember-fetch as a peerDependency

Move ember-fetch to dependencies (#3)

Indeed, two `ember-fetch`'s modules are imported in rest-adapter.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

Comments