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 #23681] Use puma 3.0.0+ #23906

Merged
merged 1 commit into from Feb 26, 2016
Merged

[close #23681] Use puma 3.0.0+ #23906

merged 1 commit into from Feb 26, 2016

Conversation

@schneems
Copy link
Member

@schneems schneems commented Feb 26, 2016

Puma 3.0 and up introduced compatibility to read from config/puma.rb when booting from the command $ rails serverpuma/puma#856.

Puma 3.0 and up introduced compatibility to read from `config/puma.rb` when booting from the command `$ rails server`puma/puma#856.
@rafaelfranca
Copy link
Member

@rafaelfranca rafaelfranca commented Feb 26, 2016

:shipit: on 🍏 tests.

@schneems
Copy link
Member Author

@schneems schneems commented Feb 26, 2016

Hey, someone edited my PR message. Tests are green, merging.

schneems added a commit that referenced this pull request Feb 26, 2016
[close #23681] Use puma 3.0.0+
@schneems schneems merged commit 364e155 into rails:master Feb 26, 2016
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@rafaelfranca
Copy link
Member

@rafaelfranca rafaelfranca commented Feb 26, 2016

I did edited your PR message. It was using the template 😄

@rafaelfranca
Copy link
Member

@rafaelfranca rafaelfranca commented Feb 26, 2016

I mean, its content was the exactly same text of the template.

@schneems
Copy link
Member Author

@schneems schneems commented Feb 26, 2016

I tweeted about not liking the default text in the template and linked to the PR 😉

@rafaelfranca
Copy link
Member

@rafaelfranca rafaelfranca commented Feb 26, 2016

We can fix that in one second 😄

@rafaelfranca
Copy link
Member

@rafaelfranca rafaelfranca commented Feb 26, 2016

Here is the previous PR description:

Summary

Provide a general description of the code changes in your pull
request... were there any bugs you had fixed? If so, mention them. If
these bugs have open GitHub issues, be sure to tag them here as well,
to keep the conversation linked together.

Other Information

If there's anything else that's important and relevant to your pull
request, mention that information here. This could include
benchmarks, or other information.

Finally, if your pull request affects documentation or any non-code
changes, guidelines for those changes are available
here

Thanks for contributing to Rails!

Puma 3.0 and up introduced compatibility to read from config/puma.rb when booting from the command $ rails serverpuma/puma#856.

@swrobel
Copy link
Contributor

@swrobel swrobel commented Mar 8, 2016

@schneems is it possible to have rails server run puma with a custom config file path, or without a config file at all?

@schneems
Copy link
Member Author

@schneems schneems commented Mar 8, 2016

The config file isn't required to run rails server but it if is present it will be picked up automatically.

If you want to specify a location to the config file you can run puma -C <path/to/config/file> instead to run your server.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.