fix some warning reported when rails server starts

4 files changed, 9 insertions, 4 deletions

diff --git a/Gemfile b/Gemfile
index ea1faa593..6e46c6605 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,6 +19,7 @@ end
 
 # Authentication
 gem 'devise', '2.1.3'
+gem 'devise-encryptable'
 gem 'devise_invitable'
 
 # Map, Geolocalization
diff --git a/Gemfile.lock b/Gemfile.lock
index 928a8aa90..26a0443f9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -90,6 +90,8 @@ GEM
       orm_adapter (~> 0.1)
       railties (~> 3.1)
       warden (~> 1.2.1)
+    devise-encryptable (0.1.2)
+      devise (>= 2.1.0)
     devise_invitable (1.1.0)
       actionmailer (~> 3.0)
       devise (>= 2.1.0)
@@ -338,6 +340,7 @@ DEPENDENCIES
   daemons
   delayed_job_active_record
   devise (= 2.1.3)
+  devise-encryptable
   devise_invitable
   dr-apartment
   factory_girl_rails (= 1.7)
diff --git a/config/application.rb b/config/application.rb
index 07005e9f9..865becd53 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -13,7 +13,7 @@ module ChouetteIhm
   class Application < Rails::Application
 
     config.generators do |g|
-      g.test_framework :rspec        
+      g.test_framework :rspec
     end
 
     # Settings in config/environments/* take precedence over those specified here.
@@ -29,7 +29,7 @@ module ChouetteIhm
 
     # Activate observers that should always be running.
     # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-    
+
     # custom exception pages
     config.exceptions_app = self.routes
 
@@ -40,6 +40,7 @@ module ChouetteIhm
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     config.i18n.default_locale = :fr
+    I18n.enforce_available_locales = false
 
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 4a8d86e87..37e7c1d1f 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -10,7 +10,7 @@ Devise.setup do |config|
   # config.mailer = "Devise::Mailer"
 
   # Automatically apply schema changes in tableless databases
-  config.apply_schema = false
+  # config.apply_schema = false
 
   # ==> ORM configuration
   # Load and configure the ORM. Supports :active_record (default) and
@@ -134,7 +134,7 @@ Devise.setup do |config|
   # This configures your application to use the salt as the remember token.
   # Leave this set to true - this option was kept for backwards compatibility
   # and will be removed in some future releases.
-  config.use_salt_as_remember_token = true
+  # config.use_salt_as_remember_token = true
 
   # Options to be passed to the created cookie. For instance, you can set
   # :secure => true in order to force SSL only cookies.