Merge tag 'v1.12.0'

Version 1.12.0

3 files changed, 9 insertions, 2 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2de97e77c5..9bc64b2fad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.12.0 (2016-04-28)
+
+This space intentionally left blank.
+
 ## 1.12.0.rc.4 (2016-04-21)
 
 Bugfixes:
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index 7160a0fb2d..f7103879ac 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.12.0.rc.4" unless defined?(::Bundler::VERSION)
+  VERSION = "1.12.0" unless defined?(::Bundler::VERSION)
 end
diff --git a/man/bundle-update.ronn b/man/bundle-update.ronn
index d38c9d2f36..0df3ee7abc 100644
--- a/man/bundle-update.ronn
+++ b/man/bundle-update.ronn
@@ -3,7 +3,7 @@ bundle-update(1) -- Update your gems to the latest available versions
 
 ## SYNOPSIS
 
-`bundle update` <*gems> [--group=NAME] [--source=NAME] [--local]
+`bundle update` <*gems> [--group=NAME] [--source=NAME] [--local] [--ruby]
 
 ## DESCRIPTION
 
@@ -31,6 +31,9 @@ gem.
 * `--local`:
   Do not attempt to fetch gems remotely and use the gem cache instead.
 
+* `--ruby`:
+  Update the locked version of Ruby to the current version of Ruby.
+
 ## UPDATING ALL GEMS
 
 If you run `bundle update` with no parameters, bundler will ignore