summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md7
-rw-r--r--lib/bundler/version.rb2
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6aba0646d1..689c8ba57e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 1.2.5 (Feb 24, 2013)
+
+Bugfixes:
+
+ - install Gemfiles with HTTP sources even without OpenSSL present
+ - display CerficateFailureError message in full
+
## 1.2.4 (Feb 12, 2013)
Features:
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index 5d3ed5013a..df6ed32f47 100644
--- a/lib/bundler/version.rb
+++ b/lib/bundler/version.rb
@@ -2,5 +2,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.2.4" unless defined?(::Bundler::VERSION)
+ VERSION = "1.2.5" unless defined?(::Bundler::VERSION)
end