From b19e1e8215d2144935c6a6544e2de6953e4ba847 Mon Sep 17 00:00:00 2001
From: Chris Heald <cheald@gmail.com>
Date: Mon, 28 Jan 2013 14:55:56 -0700
Subject: [PATCH] Update Devise in response to posted security bulletin

---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index b4b3c0e..3b54673 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source 'http://rubygems.org'
 gem 'rails', '3.2.11'
 gem 'mongoid', '~> 2.4.10'
 gem 'mongoid_rails_migrations'
-gem 'devise', '~> 1.5.3'
+gem 'devise', '~> 1.5.4'
 gem 'haml'
 gem 'htmlentities', "~> 4.3.0"
 gem 'rack-ssl', :require => 'rack/ssl'   # force SSL
diff --git a/Gemfile.lock b/Gemfile.lock
index 89aa0ae..1d07381 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -86,7 +86,7 @@ GEM
     debugger-linecache (1.1.2)
       debugger-ruby_core_source (>= 1.1.1)
     debugger-ruby_core_source (1.1.4)
-    devise (1.5.3)
+    devise (1.5.4)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.0.3)
       warden (~> 1.1)
@@ -106,7 +106,7 @@ GEM
     ffi (1.1.4)
     foreman (0.60.2)
       thor (>= 0.13.6)
-    haml (3.1.6)
+    haml (3.1.7)
     happymapper (0.4.0)
       libxml-ruby (~> 2.0)
     has_scope (0.5.1)
@@ -340,7 +340,7 @@ DEPENDENCIES
   capybara
   database_cleaner (~> 0.6.0)
   debugger
-  devise (~> 1.5.3)
+  devise (~> 1.5.4)
   email_spec
   execjs
   fabrication (~> 1.3.0)
--
libgit2 0.21.2