Merge tag 'v1.15.2'

Version 1.15.2

# Conflicts:
#	Rakefile
#	doc/development/SETUP.md
#	lib/bundler/cli.rb
#	lib/bundler/installer.rb
#	lib/bundler/setup.rb
#	spec/commands/install_spec.rb
#	spec/quality_spec.rb
#	spec/runtime/inline_spec.rb
#	spec/support/artifice/compact_index_partial_update.rb
#	spec/support/rubygems_ext.rb

3 files changed, 24 insertions, 1 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98929ba648..c01414e9a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,21 @@
+## 1.15.2 (2017-07-17)
+
+Features:
+
+  - new gemfiles created by bundler will include an explicit `github` git source that uses `https` (@segiddins)
+
+Bugfixes:
+
+  - inline gemfiles work when `BUNDLE_BIN` is set (#5847, @segiddins)
+  - avoid using the old dependency API when there are no changes to the compact index files (#5373, @greysteil)
+  - fail gracefully when the full index serves gemspecs with invalid dependencies (#5797, @segiddins)
+  - support installing gemfiles that use `eval_gemfile`, `:path` gems with relative paths, and `--deployment` simultaneously (@NickLaMuro)
+  - `bundle config` will print settings as the type they are interpreted as (@segiddins)
+  - respect the `no_proxy` environment variable when making network requests (#5781, @jakauppila)
+  - commands invoked with `--verbose` will not have default flags printed (@segiddins)
+  - allow `bundle viz` to work when another gem has a requirable `grapviz` file (#5707, @segiddins)
+  - ensure bundler puts activated gems on the `$LOAD_PATH` in a consistent order (#5696, @segiddins)
+
 ## 1.15.1 (2017-06-02)
 
 Bugfixes:
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index dad4a88a26..a906b127d4 100644
--- a/lib/bundler/version.rb
+++ b/lib/bundler/version.rb
@@ -7,7 +7,7 @@ module Bundler
   # We're doing this because we might write tests that deal
   # with other versions of bundler and we are unsure how to
   # handle this better.
-  VERSION = "1.15.1" unless defined?(::Bundler::VERSION)
+  VERSION = "1.15.2" unless defined?(::Bundler::VERSION)
 
   def self.overwrite_loaded_gem_version
     begin
diff --git a/spec/bundler/cli_spec.rb b/spec/bundler/cli_spec.rb
index 1bc1b59610..8014f72d11 100644
--- a/spec/bundler/cli_spec.rb
+++ b/spec/bundler/cli_spec.rb
@@ -65,6 +65,11 @@ RSpec.describe "bundle executable" do
       install_gemfile! "", :verbose => true
       expect(last_command.stdout).to start_with("Running `bundle install --no-color --retry 0 --verbose` with bundler #{Bundler::VERSION}")
     end
+
+    it "doesn't print defaults" do
+      install_gemfile! "", :verbose => true
+      expect(out).to start_with("Running `bundle install --no-color --retry 0 --verbose` with bundler #{Bundler::VERSION}")
+    end
   end
 
   describe "printing the outdated warning" do