summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md9
-rw-r--r--lib/bundler/version.rb2
2 files changed, 7 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5015be7d79..804f6672f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,11 @@
-## 1.7.4 (2014-10-10)
+## 1.7.4 (2014-10-19)
Bugfixes:
+ - Allow --deployment after `pack` while using source blocks (#3167, @tmoore)
- Use dependency API even when HTTP credentials are in ENV (#3191, @fvaleur)
+ - Silence warnings (including root warning) in --quiet mode (#3186, @indirect)
+ - Stop asking gem servers for gems already found locally (#2909, @dubek)
## 1.7.3 (2014-09-14)
@@ -34,11 +37,11 @@ Security:
Features:
- Gemfile `source` calls now take a block containing gems from that source (@tmoore)
- - added the `:source` option to `gem` to specify a source (@tmoore)
+ - Added the `:source` option to `gem` to specify a source (@tmoore)
Bugfixes:
- - warn on ambiguous gems available from more than one source (@tmoore)
+ - Warn on ambiguous gems available from more than one source (@tmoore)
## 1.6.5 (2014-07-23)
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index 503bf4832c..9989ef90be 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.7.4.pre" unless defined?(::Bundler::VERSION)
+ VERSION = "1.7.4" unless defined?(::Bundler::VERSION)
end