diff options
-rw-r--r-- | CHANGELOG.md | 17 | ||||
-rw-r--r-- | lib/bundler/version.rb | 2 |
2 files changed, 18 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 22461ae880..6e55ec7640 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,20 @@ +## 1.3.0 (24 February 2013) + +Features: + + - raise a useful error when the lockfile contains a merge conflict (@zofrex) + - ensure `rake release` checks for uncommitted as well as unstaged (@benmoss) + - allow environment variables to be negated with 'false' and '0' (@brettporter) + - set $MANPATH inside `exec` for gems with man pages (@sunaku) + - partial gem names for `open` and `update` now return a list (@takkanm) + +Bugfixes: + + - `update` now (again) finds gems that aren't listed in the Gemfile + - `install` now (again) updates cached gems that aren't in the Gemfile + - install Gemfiles with HTTP sources even without OpenSSL present + - display CerficateFailureError message in full + ## 1.3.0.pre.8 (12 February 2013) Security: diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb index 8e7f08ac9c..899528d643 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.3.0.pre.8" unless defined?(::Bundler::VERSION) + VERSION = "1.3.0" unless defined?(::Bundler::VERSION) end |