summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2017-05-19 08:45:54 -0700
committerSamuel Giddins <segiddins@segiddins.me>2017-05-19 08:45:54 -0700
commit024c7e380e62e95e5dd3eac39390e69e340e688d (patch)
treece0d2b9c2cd15cd303ed5feba30c0995900a422e
parent52e01785a50ceba97c7ea850e103a2647a0d4ff6 (diff)
parentc5305b031074fe78d52c130e80d2e6ea8545a505 (diff)
downloadbundler-024c7e380e62e95e5dd3eac39390e69e340e688d.tar.gz
Merge tag 'v1.15.0'
Version 1.15.0
-rw-r--r--CHANGELOG.md4
-rw-r--r--lib/bundler/version.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0bc2457321..b54d4a8fdd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.15.0 (2017-05-19)
+
+This space intentionally left blank.
+
## 1.15.0.pre.4 (2017-05-10)
Bugfixes:
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index 80380a3878..401655269d 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.0.pre.4" unless defined?(::Bundler::VERSION)
+ VERSION = "1.15.0" unless defined?(::Bundler::VERSION)
def self.overwrite_loaded_gem_version
begin