need to require devise-encryptable

This commit is contained in:
Paul Sponagl 2012-06-09 09:54:58 +02:00
parent 702283322d
commit a6ba124a9e
4 changed files with 2 additions and 5 deletions

View File

@ -5,10 +5,6 @@ source :rubygems
gemspec # Include gemspec dependencies 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 # The rest of the dependencies are for use when in the locomotive development environment
group :development do group :development do

View File

@ -329,7 +329,6 @@ DEPENDENCIES
compass-rails compass-rails
cucumber-rails cucumber-rails
database_cleaner database_cleaner
devise-encryptable
factory_girl_rails (~> 1.6.0) factory_girl_rails (~> 1.6.0)
json_spec json_spec
launchy launchy

View File

@ -1,6 +1,7 @@
require 'locomotive/version' require 'locomotive/version'
require 'locomotive/core_ext' require 'locomotive/core_ext'
require 'locomotive/configuration' require 'locomotive/configuration'
require 'locomotive/devise'
require 'locomotive/logger' require 'locomotive/logger'
require 'locomotive/haml' require 'locomotive/haml'
require 'locomotive/formtastic' require 'locomotive/formtastic'

View File

@ -1 +1,2 @@
# patches for devise here # patches for devise here
require 'devise-encryptable'