need to require devise-encryptable

2012-06-09 09:54:58 +02:00 · 2012-06-09 09:54:58 +02:00 · a6ba124a9e
commit a6ba124a9e
parent 702283322d
4 changed files with 2 additions and 5 deletions
--- a/4
+++ b/4
@ -5,10 +5,6 @@ source :rubygems

 gemspec # Include gemspec dependencies

-# Devise 2.1 throws an error if devise-encryptable is present in gemspec only
-# TODO: Check Devise Code to remove that 'broken' existance test for devise-encryptable
-gem 'devise-encryptable'
-
 # The rest of the dependencies are for use when in the locomotive development environment

 group :development do
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -329,7 +329,6 @@ DEPENDENCIES
  compass-rails
  cucumber-rails
  database_cleaner
-  devise-encryptable
  factory_girl_rails (~> 1.6.0)
  json_spec
  launchy
--- a/lib/locomotive.rb
+++ b/lib/locomotive.rb
@ -1,6 +1,7 @@
 require 'locomotive/version'
 require 'locomotive/core_ext'
 require 'locomotive/configuration'
+require 'locomotive/devise'
 require 'locomotive/logger'
 require 'locomotive/haml'
 require 'locomotive/formtastic'
--- a/lib/locomotive/devise.rb
+++ b/lib/locomotive/devise.rb
@ -1 +1,2 @@
 # patches for devise here
+require 'devise-encryptable'