From 0a26778684ad43e2d44f0e59aa35c9675ba457ae Mon Sep 17 00:00:00 2001 From: Stephen Crosby Date: Sun, 4 Jan 2015 13:11:21 -0800 Subject: [PATCH] Upgrade devise to 3.4.1 --- Gemfile.lock | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 24fd076..8bb9edf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -50,7 +50,7 @@ GEM builder json arel (5.0.1.20140414130214) - bcrypt-ruby (3.1.2) + bcrypt (3.1.9) better_errors (1.0.1) coderay (>= 1.0.0) erubis (>= 2.6.6) @@ -93,10 +93,11 @@ GEM database_cleaner (1.2.0) debug_inspector (0.0.2) decent_exposure (2.3.2) - devise (3.1.1) - bcrypt-ruby (~> 3.0) + devise (3.4.1) + bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 3.2.6, < 5) + responders thread_safe (~> 0.1) warden (~> 1.2.3) diff-lcs (1.2.4) @@ -210,7 +211,7 @@ GEM omniauth (~> 1.0) optionable (0.2.0) origin (2.1.1) - orm_adapter (0.4.0) + orm_adapter (0.5.0) pjax_rails (0.3.4) jquery-rails poltergeist (1.5.1) @@ -261,6 +262,8 @@ GEM rdoc (4.1.2) json (~> 1.4) request_store (1.0.6) + responders (1.1.2) + railties (>= 3.2, < 4.2) rest-client (1.6.8) mime-types (~> 1.16) rdoc (>= 2.4.2) -- libgit2 0.21.2