From 1511ed916156c6072cfba05b37f9f2c1bec2f0b6 Mon Sep 17 00:00:00 2001 From: Elliot Winkler Date: Wed, 30 Apr 2014 17:52:47 -0400 Subject: [PATCH] Bump version to 2.6.1 --- Gemfile.lock | 2 +- NEWS.md | 9 +++++---- gemfiles/3.0.gemfile.lock | 2 +- gemfiles/3.1.gemfile.lock | 2 +- gemfiles/3.2.gemfile.lock | 2 +- gemfiles/4.0.0.gemfile.lock | 2 +- gemfiles/4.0.1.gemfile.lock | 2 +- gemfiles/4.1.gemfile.lock | 2 +- lib/shoulda/matchers/version.rb | 2 +- 9 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9a450ef5..e1eda668 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - shoulda-matchers (2.6.1.rc2) + shoulda-matchers (2.6.1) activesupport (>= 3.0.0) GEM diff --git a/NEWS.md b/NEWS.md index 304ed999..fd699723 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# HEAD +# 2.6.1 ## Features @@ -13,10 +13,11 @@ using a very small decimal number offset rather than a whole number by default, except if the matcher was qualified with `only_integer`. This means that prior to 2.6.0, if your validation specified `only_integer` and you did - not, then after 2.6.0 that test now fails. + not, then after 2.6.0 that test would fail. This is now fixed. -* Fix so that ActiveRecord matchers aren't included when ActiveRecord - isn't defined (i.e. if you are using ActiveModel only). +* Fix regression in previous release where ActiveRecord matchers would not be + included when ActiveRecord wasn't defined (i.e. if you were using ActiveModel + only). * Revert the behavior of `allow_value` changed in 2.6.0 (it will no longer raise CouldNotClearAttribute). This was originally done as a part of a fix for diff --git a/gemfiles/3.0.gemfile.lock b/gemfiles/3.0.gemfile.lock index bd07549f..e1921cd6 100644 --- a/gemfiles/3.0.gemfile.lock +++ b/gemfiles/3.0.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: ../ specs: - shoulda-matchers (2.6.1.rc2) + shoulda-matchers (2.6.1) activesupport (>= 3.0.0) GEM diff --git a/gemfiles/3.1.gemfile.lock b/gemfiles/3.1.gemfile.lock index bdebc43f..6bb2e39f 100644 --- a/gemfiles/3.1.gemfile.lock +++ b/gemfiles/3.1.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: ../ specs: - shoulda-matchers (2.6.1.rc2) + shoulda-matchers (2.6.1) activesupport (>= 3.0.0) GEM diff --git a/gemfiles/3.2.gemfile.lock b/gemfiles/3.2.gemfile.lock index 54b12671..a8ca23f5 100644 --- a/gemfiles/3.2.gemfile.lock +++ b/gemfiles/3.2.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: ../ specs: - shoulda-matchers (2.6.1.rc2) + shoulda-matchers (2.6.1) activesupport (>= 3.0.0) GEM diff --git a/gemfiles/4.0.0.gemfile.lock b/gemfiles/4.0.0.gemfile.lock index ac1f91bc..f3cb68da 100644 --- a/gemfiles/4.0.0.gemfile.lock +++ b/gemfiles/4.0.0.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: ../ specs: - shoulda-matchers (2.6.1.rc2) + shoulda-matchers (2.6.1) activesupport (>= 3.0.0) GEM diff --git a/gemfiles/4.0.1.gemfile.lock b/gemfiles/4.0.1.gemfile.lock index 306aade5..ced5b7e9 100644 --- a/gemfiles/4.0.1.gemfile.lock +++ b/gemfiles/4.0.1.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: ../ specs: - shoulda-matchers (2.6.1.rc2) + shoulda-matchers (2.6.1) activesupport (>= 3.0.0) GEM diff --git a/gemfiles/4.1.gemfile.lock b/gemfiles/4.1.gemfile.lock index d3f215b2..96f6cd79 100644 --- a/gemfiles/4.1.gemfile.lock +++ b/gemfiles/4.1.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .././ specs: - shoulda-matchers (2.6.1.rc2) + shoulda-matchers (2.6.1) activesupport (>= 3.0.0) GEM diff --git a/lib/shoulda/matchers/version.rb b/lib/shoulda/matchers/version.rb index 0242a7ab..4ab794b2 100644 --- a/lib/shoulda/matchers/version.rb +++ b/lib/shoulda/matchers/version.rb @@ -1,5 +1,5 @@ module Shoulda module Matchers - VERSION = '2.6.1.rc2'.freeze + VERSION = '2.6.1'.freeze end end