diff options
| author | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2012-12-15 01:16:25 +0100 |
|---|---|---|
| committer | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2012-12-20 16:54:28 +0100 |
| commit | 19eb63741995e3be60781db74edab5d5ae896c6b (patch) | |
| tree | 349c2f0d63b4bf89500de1c8c3ee5887dc981e68 /config/initializers/devise.rb | |
| parent | b2e46f44ceee2078b8e1d92ae5ff892c044bc0e7 (diff) | |
| download | gitlab-ce-19eb63741995e3be60781db74edab5d5ae896c6b.tar.gz | |
Update uses of Gitolite.config.foo settings
Diffstat (limited to 'config/initializers/devise.rb')
| -rw-r--r-- | config/initializers/devise.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 8f3cef5a2ac..db7246a1b9b 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 = Gitlab.config.email_from + config.mailer_sender = Gitlab.config.gitlab.email_from # Configure the class responsible to send e-mails. # config.mailer = "Devise::Mailer" |