diff options
| author | Andre Arko <andre@arko.net> | 2011-09-19 00:13:37 -0700 |
|---|---|---|
| committer | Andre Arko <andre@arko.net> | 2011-09-19 00:13:37 -0700 |
| commit | b8a024c9e43f6808c2e87d2532583ed52dd81ca3 (patch) | |
| tree | d1adeb993f8ca184f1998fa7f11ed65c1844789c | |
| parent | feb383c3f3141ab02e7de4b90729f10df7416e39 (diff) | |
| parent | 9d1d7f7817acb5c263f763504f5e179359a2b2a4 (diff) | |
| download | bundler-b8a024c9e43f6808c2e87d2532583ed52dd81ca3.tar.gz | |
Merge branch '1-0-stable'
| -rw-r--r-- | lib/bundler.rb | 2 | ||||
| -rw-r--r-- | lib/bundler/settings.rb | 1 | ||||
| -rw-r--r-- | man/bundle-install.ronn | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/lib/bundler.rb b/lib/bundler.rb index eaa1ca3b77..c70344c2bc 100644 --- a/lib/bundler.rb +++ b/lib/bundler.rb @@ -6,9 +6,9 @@ begin # Pull in Psych if we can, but not if Syck is already loaded require 'psych' unless defined?(YAML) rescue LoadError + require 'yaml' end -require 'yaml' require 'bundler/rubygems_ext' require 'bundler/rubygems_integration' require 'bundler/version' diff --git a/lib/bundler/settings.rb b/lib/bundler/settings.rb index a663eb8f79..85c08b199a 100644 --- a/lib/bundler/settings.rb +++ b/lib/bundler/settings.rb @@ -93,7 +93,6 @@ module Bundler def set_key(key, value, hash, file) key = key_for(key) - puts key.inspect unless hash[key] == value hash[key] = value diff --git a/man/bundle-install.ronn b/man/bundle-install.ronn index 3205c29ec7..2eadc2de00 100644 --- a/man/bundle-install.ronn +++ b/man/bundle-install.ronn @@ -56,7 +56,7 @@ update process below under [CONSERVATIVE UPDATING][]. * `--local`: Do not attempt to connect to `rubygems.org`, instead using just the gems already present in Rubygems' cache or in `vendor/cache`. - Note that if a more appropriate platform-specific gem exists on + Note that if a more appropriate platform-specific gem exists on `rubygems.org`, it will not be found. * `--deployment`: |