Merge remote-tracking branch 'upstream/master' into bundler-config-parseable-flag

* upstream/master: (522 commits)
  add tests
  fix EOL
  Require socket in the file that needs it
  use Gem::Version.correct? instead of catching exceptions
  remove rails 2.3 from ISSUES guide
  quote empty PATH
  turns out linux needs env vars to be quoted (even when empty)
  run specs without git in the env
  add specs to test gem command when git is not installed (note: this won't actually work at the moment)
  dont create .gitignore as well if git is not installed in the gem command
  dont init new git repo unless git is installed on gem command
  fix spacing between paragraphs in generated READMEs for new gems
  Account for differing behavior in hash#select between 1.8.7 and 1.9.3+
  .map -> .each, as we are not using return value
  Only uninstall plugins that we attempted to install.
  Documentation at the correct place
  Double quotes and small documentation
  --key parameter can be set via bundle config gem.push_key
  Add a spec for nested bundle exec with a gem that shadows a default gem
  Allow installing a gem from an arbitrary repo in the specs
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/spec/commands/init_spec.rb b/spec/commands/init_spec.rb
index 70d1143055..03a46a8bfa 100644
--- a/spec/commands/init_spec.rb
+++ b/spec/commands/init_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require "spec_helper"
 
-describe "bundle init" do
+RSpec.describe "bundle init" do
   it "generates a Gemfile" do
     bundle :init
     expect(bundled_app("Gemfile")).to exist