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.

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

[close #1238] Don't call non-existent method #1239

Merged
merged 3 commits into from
Mar 10, 2017
Merged

Conversation

schneems
Copy link
Contributor

Puma::Configuration._from_file was removed in 89f3743. It was still being used by the Puma::ControlCLI class which was previously not being tested while being called with a --config-file option.

This PR reintroduces the previous behavior of loading a config file when specified via pumactl command.

cc/ @nateberkopec

`Puma::Configuration._from_file` was removed in 89f3743. It was still being used by the `Puma::ControlCLI` class which was previously not being tested while being called with a `--config-file` option.

This PR reintroduces the previous behavior of loading a config file when specified via `pumactl` command.
@nateberkopec
Copy link
Member

LGTM 🚢

@schneems schneems merged commit 5bac8d5 into master Mar 10, 2017
@nateberkopec nateberkopec deleted the schneems/fix-1238 branch November 17, 2017 19:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants