aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md11
-rw-r--r--lib/bundler/version.rb2
2 files changed, 12 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3fb4f027..a5634ef4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## 1.10.4 (2015-06-16)
+
+Workarounds:
+
+ - don't add BUNDLED WITH to the lock when Spring runs `check` over and over (@indirect)
+
+Bugfixes:
+
+ - display "with native extensions" log output correctly (@ivantsepp)
+ - alias `i` to `install`, `c` to `check`, and `e` to `exec` (@indirect)
+
## 1.10.3 (2015-06-03)
Bugfixes:
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index 5c2e894e..e4646d5b 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.10.3" unless defined?(::Bundler::VERSION)
+ VERSION = "1.10.4" unless defined?(::Bundler::VERSION)
end