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

Jump to bottom

Leave BUNDLE_GEMFILE unset in workers if it was unset in the master #2154

Merged
merged 3 commits into from Mar 10, 2020
Merged

Leave BUNDLE_GEMFILE unset in workers if it was unset in the master #2154

merged 3 commits into from Mar 10, 2020

Conversation

cjlarose
Copy link
Member

@cjlarose cjlarose commented Mar 7, 2020 •
edited

Description

Closes #2133

Your checklist for this pull request

  • I have reviewed the guidelines for contributing to this repository.
  • I have added an entry to History.md if this PR fixes a bug or adds a feature. If it doesn't need an entry to HISTORY.md, I have added [changelog skip] the pull request title.
  • I have added appropriate tests if this PR fixes a bug or adds a feature.
  • My pull request is 100 lines added/removed or less so that it can be easily reviewed.
  • If this PR doesn't need tests (docs change), I added [ci skip] to the title of the PR.
  • If this closes any issues, I have added "Closes #issue" to the PR description or my commit messages.
  • I have updated the documentation accordingly.
  • All new and existing tests passed, including Rubocop.

@cjlarose cjlarose mentioned this pull request Mar 7, 2020
Closed
@cjlarose cjlarose force-pushed the preserve-unspecified-bundle-gemfile branch from cd1daf5 to 8cb5b63 Compare March 7, 2020 16:22
nateberkopec
nateberkopec reviewed Mar 7, 2020
View reviewed changes
lib/puma/launcher.rb Outdated
@@ -298,7 +298,8 @@ def prune_bundler

log '* Pruning Bundler environment'
home = ENV['GEM_HOME']
bundle_gemfile = ENV['BUNDLE_GEMFILE']
bundle_gemfile = ENV['BUNDLER_ORIG_BUNDLE_GEMFILE']
bundle_gemfile = nil if bundle_gemfile == 'BUNDLER_ENVIRONMENT_PRESERVER_INTENTIONALLY_NIL'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's this about?

Copy link
Member Author

@cjlarose cjlarose Mar 7, 2020 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed in d5e814e

@cjlarose cjlarose force-pushed the preserve-unspecified-bundle-gemfile branch from 0b47735 to d5e814e Compare March 7, 2020 17:12
@nateberkopec nateberkopec added the waiting-for-review Waiting on review from anyone label Mar 7, 2020
@seven1m
Copy link
Contributor

seven1m commented Mar 7, 2020

This is solid work. Love the test!

@nateberkopec
Copy link
Member

I'm gonna play around with the test locally but the code itself LGTM

@nateberkopec nateberkopec merged commit c87f088 into puma:master Mar 10, 2020
@dentarg dentarg mentioned this pull request Mar 27, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nateberkopec nateberkopec nateberkopec left review comments

Assignees
No one assigned
Labels
waiting-for-review Waiting on review from anyone
Projects
None yet
Milestone
No milestone
3 participants
@cjlarose @seven1m @nateberkopec