diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-09-21 09:46:47 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-09-21 10:35:37 +0200 |
| commit | ee028d9d60522f8993a0b2429ac8a0631d59229a (patch) | |
| tree | 5e028593ff4394df287de8f61824c8d004a81688 /config/initializers | |
| parent | 11bbc06b4bbcb678f3ee6b8f1d143ed86d25a76c (diff) | |
| download | gitlab-ce-ee028d9d60522f8993a0b2429ac8a0631d59229a.tar.gz | |
Rename reply_by_email to incoming_email to prepare for the future.
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/1_settings.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index ddc9bbf5dfd..48601b67335 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -187,8 +187,8 @@ Settings.gitlab_ci['builds_path'] = File.expand_path(Settings.gitlab_ci[ # # Reply by email # -Settings['reply_by_email'] ||= Settingslogic.new({}) -Settings.reply_by_email['enabled'] = false if Settings.reply_by_email['enabled'].nil? +Settings['incoming_email'] ||= Settingslogic.new({}) +Settings.incoming_email['enabled'] = false if Settings.incoming_email['enabled'].nil? # # Gravatar |