From db83a29911675c4a5d3b21882a040d7190f7dee8 Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Thu, 1 Jan 2015 17:31:58 +0100
Subject: [PATCH] added devise-async and configured Devise for email

---
 Gemfile                             | 1 +
 Gemfile.lock                        | 3 +++
 config/initializers/devise.rb       | 2 +-
 config/initializers/devise_async.rb | 1 +
 config/justask.yml.example          | 2 ++
 5 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 config/initializers/devise_async.rb

diff --git a/Gemfile b/Gemfile
index e281b595..e4a65239 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,6 +24,7 @@ gem 'will_paginate'
 gem 'will_paginate-bootstrap'
 gem 'http_accept_language'
 gem 'devise'
+gem 'devise-async'
 gem 'bootstrap_form'
 gem 'font-kit-rails'
 gem 'nprogress-rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index cc81ddf5..165fe918 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -93,6 +93,8 @@ GEM
       responders
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
+    devise-async (0.9.0)
+      devise (~> 3.2)
     diff-lcs (1.2.5)
     docile (1.1.5)
     dotenv (1.0.2)
@@ -352,6 +354,7 @@ DEPENDENCIES
   database_cleaner
   delayed_paperclip
   devise
+  devise-async
   factory_girl_rails
   faker
   font-awesome-rails (~> 4.2.0.0)
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 25c01509..3aa9864d 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -10,7 +10,7 @@ Devise.setup do |config|
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class
   # with default "from" parameter.
-  config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
+  config.mailer_sender = "#{APP_CONFIG['site_name']} <#{APP_CONFIG['email_from']}>"
 
   # Configure the class responsible to send e-mails.
   # config.mailer = 'Devise::Mailer'
diff --git a/config/initializers/devise_async.rb b/config/initializers/devise_async.rb
new file mode 100644
index 00000000..5e432598
--- /dev/null
+++ b/config/initializers/devise_async.rb
@@ -0,0 +1 @@
+Devise::Async.backend = :sidekiq
\ No newline at end of file
diff --git a/config/justask.yml.example b/config/justask.yml.example
index e596e92e..d2f26741 100644
--- a/config/justask.yml.example
+++ b/config/justask.yml.example
@@ -4,6 +4,8 @@ site_name: "justask"
 hostname: "justask.rrerr.net"
 https: true
 
+email_from: "noreply@justask.rrerr.net"
+
 # Name of the "Anonymous" user. (e.g. "Anonymous Coward", "Arno Nym", "Mr. X", ...)
 anonymous_name: "Anonymous"