summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTerence Lee <hone02@gmail.com>2012-07-17 15:56:13 -0500
committerTerence Lee <hone02@gmail.com>2012-07-17 15:56:13 -0500
commitbbce58591a9c8f1575ae19707b55aa472cf50255 (patch)
treed051a7133d87bbc2ec34a36966a27a84d2326284
parent4f9f810fa52abf3923442d6dad070607daeb3d64 (diff)
downloadbundler-1-1-stable.tar.gz
Version 1.1.5 with changelogv1.1.51-1-stable
-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