From b6124979037b4fb86ea416b08ec79b01c848946e Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 6 Apr 2012 01:28:37 +0300 Subject: [PATCH] Fixed devise email_from, reordered initalizers --- .../{gitlabhq/10_load_config.rb => 00_before_all.rb} | 0 config/initializers/devise.rb | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename config/initializers/{gitlabhq/10_load_config.rb => 00_before_all.rb} (100%) diff --git a/config/initializers/gitlabhq/10_load_config.rb b/config/initializers/00_before_all.rb similarity index 100% rename from config/initializers/gitlabhq/10_load_config.rb rename to config/initializers/00_before_all.rb diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 5b066edd..78652bc2 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -4,7 +4,7 @@ Devise.setup do |config| # ==> Mailer Configuration # 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 = EMAIL_OPTS["from"] # Configure the class responsible to send e-mails. # config.mailer = "Devise::Mailer"