From 3e621e200158c4ffc09f83ecf159460b7a9fd200 Mon Sep 17 00:00:00 2001
From: Jared Morgan <jmorgan@morgancreative.net>
Date: Wed, 3 Aug 2011 21:37:56 -0500
Subject: [PATCH] Release 1.5.0.beta

---
 CHANGELOG.rdoc           | 9 +++++++++
 Gemfile.lock             | 2 +-
 README.rdoc              | 2 +-
 lib/dm-devise/version.rb | 2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index bae4bcc..6f3b3f1 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -1,3 +1,12 @@
+== 1.5.0.beta
+
+* enhancements
+  * determine validation library extensions to load based on which validation
+    library is loaded (dm-validations or Active Model)
+  * Add data_mapper_validation_messages config option so that default messages
+    can be overriden.
+  * Add data_mapper:devise_install generator with dm-devise related options
+
 == 1.4.0
 
 * enhancements
diff --git a/Gemfile.lock b/Gemfile.lock
index 8c4d98d..32de1dc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dm-devise (1.4.0)
+    dm-devise (1.5.0.beta)
       devise (~> 1.3)
       dm-core (>= 1.0.2, < 1.2)
       dm-migrations (>= 1.0.2, < 1.2)
diff --git a/README.rdoc b/README.rdoc
index 0b8b96b..60bdb66 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -23,7 +23,7 @@ Add dm-devise and dm gems to your Gemfile. The following gems are required:
   gem 'dm-timestamps',     '~> 1.1.0'
   gem 'dm-rails',          '~> 1.1.0'
   gem 'dm-validations',    '~> 1.1.0' # Do not include if using data_mapper_active_model
-  gem 'dm-devise',         '~> 1.4.0'
+  gem 'dm-devise',         '~> 1.5.0.beta'
 
 If you're using Active Model validations, do not include dm-validations in your
 Gemfile.
diff --git a/lib/dm-devise/version.rb b/lib/dm-devise/version.rb
index 860cd2f..709a205 100644
--- a/lib/dm-devise/version.rb
+++ b/lib/dm-devise/version.rb
@@ -1,5 +1,5 @@
 module DataMapper
   module Devise
-    VERSION = '1.4.0'.freeze
+    VERSION = '1.5.0.beta'.freeze
   end
 end