Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

I must have broken stuff, anyways restoring... #11690

Merged
merged 4 commits into from
Jul 8, 2015
Merged

I must have broken stuff, anyways restoring... #11690

merged 4 commits into from
Jul 8, 2015

Conversation

stefanpenner
Copy link
Member

I must have forced push something :( going for PR and travis and branch to see what i stomped on.

duggiefresh and others added 3 commits July 8, 2015 10:20
@duggiefresh @stefanpenner
[CLEANUP beta] Removes someProperty
67a941a
@cibernox @stefanpenner
[BUGFIX release] Privatize all related with beforeObserver and deprec…
19499a3 
…ate public APIs
@stefanpenner
[BUGFIX release] Deprecate immediateObserver
3da0950 
* Ember.immediateObserver was already deprecated, but it's prototype
  extension counterpart wasn't. It's not used internally at all.

* Improve beforeObserver deprecations.

* I had to improve `Ember.deprecateFunc` to accept an options object

(originally by @cibernox, but I screwed up master, so in-case i messed something up I’ll take the git-blame
@stefanpenner stefanpenner changed the title [CLEANUP beta] Removes someProperty I must have broken stuff, anyways restoring... Jul 8, 2015
@stefanpenner
Copy link
Member Author

i think thats it

cc @machty / @cibernox

@stefanpenner
Copy link
Member Author

fixing test shortly

@stefanpenner
Copy link
Member Author

errors all appear intermittent npm / npm-registry related, rerunning affected tests.

@machty
Copy link
Contributor

machty commented Jul 8, 2015

I have concerns that this push won't actually return master to a fast-fowardable form for anyone with PRs/branches/etc prior to the force push that messed things up, but that said, I do not fully appreciate how difficult/possible it is to correct history in such a way.

@stefanpenner
Copy link
Member Author

I have concerns that this push won't actually return master to a fast-fowardable form for anyone with PRs/branches/etc prior to the force push that messed things up,

As discussed in chat, commits/prs/clones prior to the incident are unaffected. The only window is clones / rebases in the last 18 hours.

@cibernox and interim commit isn't available, no-one appears to have it local, and the branch on GH appears to be gone. So I had to reconstruct it myself, without this commit its impractical

@machty
Copy link
Contributor

machty commented Jul 8, 2015

OK, seems fine to push/merge.

stefanpenner added a commit that referenced this pull request Jul 8, 2015
@stefanpenner
Merge pull request #11690 from emberjs/fix-master
9ff18d0 
I must have broken stuff, anyways restoring...
@stefanpenner stefanpenner merged commit 9ff18d0 into master Jul 8, 2015
@stefanpenner stefanpenner deleted the fix-master branch July 8, 2015 21:20
@ghost ghost mentioned this pull request Jul 19, 2015
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@stefanpenner @machty @duggiefresh @cibernox