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

Fix environment file loader #1340

Merged
merged 8 commits into from Oct 16, 2017
Merged

Fix environment file loader #1340

merged 8 commits into from Oct 16, 2017

Commits on Jun 19, 2017

  1. Extract Puma::Configuration#config_files method and add few unit tests

    @ViliusLuneckas
    ViliusLuneckas committed Jun 19, 2017
    Copy the full SHA
    7137bef View commit details
    Browse the repository at this point in the history

  2. Add TestConfigFile#test_config_files_with_rack_env test

    @ViliusLuneckas
    ViliusLuneckas committed Jun 19, 2017
    Copy the full SHA
    a55baca View commit details
    Browse the repository at this point in the history

  3. Fix configuration loading based on RACK_ENV

    @ViliusLuneckas
    ViliusLuneckas committed Jun 19, 2017
    Copy the full SHA
    ceeb7e9 View commit details
    Browse the repository at this point in the history

  4. Add test case when config files files are not specified

    @ViliusLuneckas
    ViliusLuneckas committed Jun 19, 2017
    Copy the full SHA
    d30d28e View commit details
    Browse the repository at this point in the history

  5. Refactor Puma::Configuration#config_files method

    @ViliusLuneckas
    ViliusLuneckas committed Jun 19, 2017
    Copy the full SHA
    bc1ba97 View commit details
    Browse the repository at this point in the history

  6. Fix backwards compatibility issue. 

    Environment could be a String or Proc
    @ViliusLuneckas
    ViliusLuneckas committed Jun 19, 2017
    Copy the full SHA
    fb3fc01 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2017

  1. Merge branch 'master' of github.com:puma/puma into fix-environment-fi… 

    …le-loader
    @ViliusLuneckas
    ViliusLuneckas committed Jun 27, 2017
    Copy the full SHA
    0786b4a View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2017

  1. Merge remote-tracking branch 'origin/master' into fix-environment-fil… 

    …e-loader
    @ViliusLuneckas
    ViliusLuneckas committed Aug 5, 2017
    Copy the full SHA
    ed4be2a View commit details
    Browse the repository at this point in the history