diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-04-06 01:28:37 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-04-06 01:28:37 +0300 |
| commit | b6124979037b4fb86ea416b08ec79b01c848946e (patch) | |
| tree | e8b0df7643170a3136b246a61a15254b6d1ebbd6 /config/initializers | |
| parent | 86676476e6a8a23786ccbc927ad24140a47e96af (diff) | |
| download | gitlab-ce-b6124979037b4fb86ea416b08ec79b01c848946e.tar.gz | |
Fixed devise email_from, reordered initalizers
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/00_before_all.rb (renamed from config/initializers/gitlabhq/10_load_config.rb) | 0 | ||||
| -rw-r--r-- | config/initializers/devise.rb | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/gitlabhq/10_load_config.rb b/config/initializers/00_before_all.rb index 96919595815..96919595815 100644 --- a/config/initializers/gitlabhq/10_load_config.rb +++ b/config/initializers/00_before_all.rb diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 5b066edd47d..78652bc2d4c 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" |