Skip to content
This repository has been archived by the owner on Apr 24, 2023. It is now read-only.

Rename store and adapter #6

Closed
wants to merge 8 commits into from
Closed

Rename store and adapter #6

wants to merge 8 commits into from

Conversation

kmiyashiro
Copy link

@nolaneo I had to re-create this commit to fix deploys because your original one was no longer reachable from the tree. Should this be merged into master? Seems reasonable since we are using in production.

@nolaneo
Copy link
Member

nolaneo commented Feb 14, 2017

Thanks @kmiyashiro. I don't have strong options about merging it to master or not; it might be better to leave as a separate branch so we can pull in upstream changes more easily? (opinions @GavinJoyce?)

We're trying to get it merged upstream here: ebryn#454

@GavinJoyce
Copy link

GavinJoyce commented Feb 14, 2017

Perhaps let's leave it in a branch in intercom/ember-model and reference that in bower instead of a SHA?. That will allow us to pull in upstream changes to intercom/ember-model as needed and rebase this PR when we want to update

@GavinJoyce
Copy link

I'm going to clean up our intercom/ember-model fork as it has diverged from origin. Once I've done that, we can point to a named branch which we can rebase against new origin changes as required.

First step: https://github.com/intercom/embercom/pull/17620

@GavinJoyce
Copy link

We're no longer pointing at this sha

@GavinJoyce GavinJoyce closed this Feb 21, 2017
@GavinJoyce GavinJoyce deleted the km/fix-deploy branch February 21, 2017 10:31
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
5 participants