From d55891c9ba2c27b40f5ea889fd8b0a92e9d9caec Mon Sep 17 00:00:00 2001 From: Cyril Mougel Date: Thu, 26 Sep 2013 15:34:43 +0200 Subject: [PATCH] Update to devise 3.1 --- Gemfile | 2 +- Gemfile.lock | 12 ++++++++---- config/initializers/secret_token.rb | 2 ++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 12a46f1..a501eee 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,7 @@ gem 'railties', RAILS_VERSION gem 'mongoid' gem 'mongoid_rails_migrations' -gem 'devise', '~> 2.2.1' +gem 'devise' gem 'haml' gem 'htmlentities' gem 'rack-ssl', :require => 'rack/ssl' # force SSL diff --git a/Gemfile.lock b/Gemfile.lock index 55c21bf..28147f2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -44,6 +44,7 @@ GEM builder json arel (3.0.2) + atomic (1.1.14) bcrypt-ruby (3.1.2) better_errors (1.0.1) coderay (>= 1.0.0) @@ -97,11 +98,12 @@ GEM debugger-linecache (1.2.0) debugger-ruby_core_source (1.2.3) decent_exposure (2.3.0) - devise (2.2.7) + devise (3.1.0) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.1) - railties (~> 3.1) - warden (~> 1.2.1) + railties (>= 3.2.6, < 5) + thread_safe (~> 0.1) + warden (~> 1.2.3) diff-lcs (1.2.4) dotenv (0.9.0) email_spec (1.5.0) @@ -353,6 +355,8 @@ GEM libv8 (~> 3.16.14.0) ref thor (0.18.1) + thread_safe (0.1.3) + atomic tilt (1.4.1) timecop (0.6.1) tins (0.10.0) @@ -401,7 +405,7 @@ DEPENDENCIES database_cleaner (~> 0.9.0) debugger decent_exposure - devise (~> 2.2.1) + devise email_spec execjs fabrication diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb index 4b33380..9c39181 100644 --- a/config/initializers/secret_token.rb +++ b/config/initializers/secret_token.rb @@ -34,3 +34,5 @@ else ERROR end end + +Devise.secret_key = Errbit::Application.config.secret_token -- libgit2 0.21.2