Merge tag 'v1.7.1'

Version 1.7.1

Conflicts:
	CHANGELOG.md
	lib/bundler/dsl.rb
	lib/bundler/index.rb
	lib/bundler/lockfile_parser.rb
	lib/bundler/source/rubygems.rb
	man/gemfile.5.ronn

1 files changed, 12 insertions, 0 deletions

diff --git a/spec/install/deploy_spec.rb b/spec/install/deploy_spec.rb
index 4898779a21..9116a34777 100644
--- a/spec/install/deploy_spec.rb
+++ b/spec/install/deploy_spec.rb
@@ -79,6 +79,18 @@ describe "install with --deployment or --frozen" do
     expect(exitstatus).to eq(0)
   end
 
+  it "works when there are credentials in the source URL" do
+    install_gemfile(<<-G, :artifice => "endpoint_strict_basic_authentication", :quiet => true)
+      source "http://user:pass@localgemserver.test/"
+
+      gem "rack-obama", ">= 1.0"
+    G
+
+    bundle "install --deployment", :exitstatus => true, :artifice => "endpoint_strict_basic_authentication"
+
+    expect(exitstatus).to eq(0)
+  end
+
   describe "with an existing lockfile" do
     before do
       bundle "install"