diff --git a/lib/bundler/man/bundle-config.1 b/lib/bundler/man/bundle-config.1 index 819638d4206a8e..5da41c9ae578b3 100644 --- a/lib/bundler/man/bundle-config.1 +++ b/lib/bundler/man/bundle-config.1 @@ -182,6 +182,9 @@ The following is a list of all configuration keys and their purpose\. You can le \fBdeployment\fR (\fBBUNDLE_DEPLOYMENT\fR): Disallow changes to the \fBGemfile\fR\. When the \fBGemfile\fR is changed and the lockfile has not been updated, running Bundler commands will be blocked\. . .IP "\(bu" 4 +\fBdisable_bundled_gems_load_path\fR (\fBBUNDLE_DISABLE_BUNDLED_GEMS_LOAD_PATH\fR): Stop to add the \fBbundled_gems\fR load paths to \fB$LOAD_PATH\fR under the Bundler environment\. +. +.IP "\(bu" 4 \fBdisable_checksum_validation\fR (\fBBUNDLE_DISABLE_CHECKSUM_VALIDATION\fR): Allow installing gems even if they do not match the checksum provided by RubyGems\. . .IP "\(bu" 4 @@ -194,9 +197,6 @@ The following is a list of all configuration keys and their purpose\. You can le \fBdisable_local_revision_check\fR (\fBBUNDLE_DISABLE_LOCAL_REVISION_CHECK\fR): Allow Bundler to use a local git override without checking if the revision present in the lockfile is present in the repository\. . .IP "\(bu" 4 -\fBdisable_bundled_gems_load_path\fR (\fBBUNDLE_DISABLE_BUNDLED_GEMS_LOAD_PATH\fR): Stop to add the \fBbundled_gems\fR load paths to \fB$LOAD_PATH\fR under the Bundler environment\. -. -.IP "\(bu" 4 \fBdisable_shared_gems\fR (\fBBUNDLE_DISABLE_SHARED_GEMS\fR): Stop Bundler from accessing gems installed to RubyGems\' normal location\. . .IP "\(bu" 4 diff --git a/lib/bundler/man/bundle-config.1.ronn b/lib/bundler/man/bundle-config.1.ronn index 55b34f552424f5..a778ebaa5f4aef 100644 --- a/lib/bundler/man/bundle-config.1.ronn +++ b/lib/bundler/man/bundle-config.1.ronn @@ -170,6 +170,9 @@ learn more about their operation in [bundle install(1)](bundle-install.1.html). * `deployment` (`BUNDLE_DEPLOYMENT`): Disallow changes to the `Gemfile`. When the `Gemfile` is changed and the lockfile has not been updated, running Bundler commands will be blocked. +* `disable_bundled_gems_load_path` (`BUNDLE_DISABLE_BUNDLED_GEMS_LOAD_PATH`): + Stop to add the `bundled_gems` load paths to `$LOAD_PATH` under the + Bundler environment. * `disable_checksum_validation` (`BUNDLE_DISABLE_CHECKSUM_VALIDATION`): Allow installing gems even if they do not match the checksum provided by RubyGems. @@ -182,9 +185,6 @@ learn more about their operation in [bundle install(1)](bundle-install.1.html). * `disable_local_revision_check` (`BUNDLE_DISABLE_LOCAL_REVISION_CHECK`): Allow Bundler to use a local git override without checking if the revision present in the lockfile is present in the repository. -* `disable_bundled_gems_load_path` (`BUNDLE_DISABLE_BUNDLED_GEMS_LOAD_PATH`): - Stop to add the `bundled_gems` load paths to `$LOAD_PATH` under the - Bundler environment. * `disable_shared_gems` (`BUNDLE_DISABLE_SHARED_GEMS`): Stop Bundler from accessing gems installed to RubyGems' normal location. * `disable_version_check` (`BUNDLE_DISABLE_VERSION_CHECK`): diff --git a/lib/bundler/settings.rb b/lib/bundler/settings.rb index 9e42d32a4785d4..9e79ba7be29e79 100644 --- a/lib/bundler/settings.rb +++ b/lib/bundler/settings.rb @@ -16,11 +16,11 @@ class Settings clean default_install_uses_path deployment + disable_bundled_gems_load_path disable_checksum_validation disable_exec_load disable_local_branch_check disable_local_revision_check - disable_bundled_gems_load_path disable_shared_gems disable_version_check force_ruby_platform