summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md6
-rw-r--r--lib/bundler/version.rb2
2 files changed, 7 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3f0515ec1..a1aafc41ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.1.5 (Jul 17, 2012)
+
+Features:
+
+ - Special case `ruby` directive from 1.2.0, so you can install Gemfiles that use it
+
## 1.1.4 (May 27, 2012)
Bugfixes:
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index 2fd259aa09..48005df48f 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.1.4" unless defined?(::Bundler::VERSION)
+ VERSION = "1.1.5" unless defined?(::Bundler::VERSION)
end