Skip to content

Revert https://github.com/nock/nock/pull/1270#1335

Merged
paulmelnikow merged 5 commits intonock:masterfrom
Chengxuan:issue1334
Jan 2, 2019
Merged

Revert https://github.com/nock/nock/pull/1270#1335
paulmelnikow merged 5 commits intonock:masterfrom
Chengxuan:issue1334

Conversation

@Chengxuan
Copy link
Copy Markdown
Contributor

@Chengxuan Chengxuan commented Jan 2, 2019

fixes #1334

Forced pushed the branch to get Travis status on both commits.

@paulmelnikow
Copy link
Copy Markdown
Member

@gr2m What's the best way to land this? Should it go to both master and beta?

@gr2m
Copy link
Copy Markdown
Member

gr2m commented Jan 2, 2019

Merge into one of them, cherry pick into the other

@Chengxuan Chengxuan changed the title Issue1334 Revert https://github.com/nock/nock/pull/1270 Jan 2, 2019
@Chengxuan Chengxuan changed the title Revert https://github.com/nock/nock/pull/1270 Revert #1270 Jan 2, 2019
@Chengxuan Chengxuan changed the title Revert #1270 Revert https://github.com/nock/nock/pull/1270 Jan 2, 2019
@paulmelnikow
Copy link
Copy Markdown
Member

paulmelnikow commented Jan 2, 2019

@gr2m Okay, shall I merge this then? How's this look for a commit message?

fix: Mock responses should fire when timers are mocked

Revert #1270. Fix #1334.

@gr2m
Copy link
Copy Markdown
Member

gr2m commented Jan 2, 2019

How's this look for a commit message?

fix: Mock responses should fire when timers are mocked

Revert #1270. Fix #1334.

A+, would commit :)

@paulmelnikow paulmelnikow merged commit cb56669 into nock:master Jan 2, 2019
@nockbot
Copy link
Copy Markdown
Collaborator

nockbot commented Jan 2, 2019

🎉 This PR is included in version 10.0.6 🎉

The release is available on:

Your semantic-release bot 📦🚀

@lock
Copy link
Copy Markdown

lock bot commented Jan 16, 2019

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue and add a reference to this one if it’s related. Thank you!

@lock lock bot locked as resolved and limited conversation to collaborators Jan 16, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants