summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2017-01-20 17:41:11 -0600
committerSamuel Giddins <segiddins@segiddins.me>2017-01-20 17:41:11 -0600
commit5fb2d6f6e5b8af211225d37f19dbbd36b3559689 (patch)
treecbb1e7067aaa9c393fd7de432302fc1999250dab
parentb82d344131258ce9f2a968741ba19c17227b5cc7 (diff)
downloadbundler-5fb2d6f6e5b8af211225d37f19dbbd36b3559689.tar.gz
Version 1.14.0 with changelogv1.14.0
-rw-r--r--CHANGELOG.md8
-rw-r--r--lib/bundler/version.rb2
2 files changed, 9 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08069da7f4..091979f5e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 1.14.0 (2017-01-20)
+
+Bugfixes:
+
+ - ensure `Settings::Mirror` is autoloaded under the `Settings` namespace
+ (#5238, @segiddins)
+ - fix `bundler/inline` when `BUNDLE_GEMFILE=""` (#5079, @segiddins)
+
## 1.14.0.pre.2 (2017-01-11)
Bugfixes:
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index a514b75cce..a55df76934 100644
--- a/lib/bundler/version.rb
+++ b/lib/bundler/version.rb
@@ -7,5 +7,5 @@ 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.14.0.pre.2" unless defined?(::Bundler::VERSION)
+ VERSION = "1.14.0" unless defined?(::Bundler::VERSION)
end