summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md12
-rw-r--r--lib/bundler/version.rb2
2 files changed, 13 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ad7e06612..6f9f6569fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 2.0.0.pre.2 (2018-11-27)
+
+Breaking Changes:
+
+ - `:github` source in the Gemfile now defaults to using HTTPS
+
+Changes
+
+ - Add compatibility for Bundler merge into ruby-src
+
+Note: To upgrade your Gemfile to Bundler 2 you will need to run `bundle update --bundler`
+
## 2.0.0.pre.1 (2018-11-09)
Breaking Changes:
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index 25a72b272e..bf6c477c92 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 = "2.0.0.pre.1" unless defined?(::Bundler::VERSION)
+ VERSION = "2.0.0.pre.2" unless defined?(::Bundler::VERSION)
def self.overwrite_loaded_gem_version
begin