diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-09-21 18:52:13 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-09-21 18:52:13 +0000 |
| commit | d4a960161eecf5730b56d3f375573fa39aa67e95 (patch) | |
| tree | 543dacf2fb1a37e77c4ae91cf935015e2d9f410f /config | |
| parent | 534e548d4495e2193af6542ca8d62e7d5a3a223b (diff) | |
| parent | 017219e7f548936ce348eeb445dc4717896902ec (diff) | |
| download | gitlab-ce-d4a960161eecf5730b56d3f375573fa39aa67e95.tar.gz | |
Merge branch 'rename-reply-by-email' into 'master'
Rename reply_by_email to incoming_email to prepare for the future.
Closes #2579.
See merge request !1367
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 8 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 856e75dc829..15930fc9079 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -96,10 +96,10 @@ production: &base ## Reply by email # Allow users to comment on issues and merge requests by replying to notification emails. - # For documentation on how to set this up, see http://doc.gitlab.com/ce/reply_by_email/README.html - reply_by_email: + # For documentation on how to set this up, see http://doc.gitlab.com/ce/incoming_email/README.html + incoming_email: enabled: false - address: "replies+%{reply_key}@gitlab.example.com" + address: "incoming+%{key}@gitlab.example.com" ## Gravatar ## For Libravatar see: http://doc.gitlab.com/ce/customization/libravatar.html @@ -425,4 +425,4 @@ test: sync_ssh_keys: false staging: - <<: *base
\ No newline at end of file + <<: *base 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 |