Merge branch 'add-smtp-upgrade-info' into 'master'

Add SMTP upgrade information 8.8 to 8.9 requires an update to the SMTP settings for source installs. See merge request !4966

Merge branch 'add-smtp-upgrade-info' into 'master'
9315597a · Achilleas Pipinellis · 365015e3 · 3be80540 · 9315597a
Commit 9315597a authored Jun 28, 2016 by Achilleas Pipinellis
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 0 deletions

8.8-to-8.9.md doc/update/8.8-to-8.9.md +13 -0

No files found.
--- a/doc/update/8.8-to-8.9.md
+++ b/doc/update/8.8-to-8.9.md
@@ -122,6 +122,19 @@ via [/etc/default/gitlab].
 [Apache templates]: https://gitlab.com/gitlab-org/gitlab-recipes/tree/master/web-server/apache
 [/etc/default/gitlab]: https://gitlab.com/gitlab-org/gitlab-ce/blob/8-9-stable/lib/support/init.d/gitlab.default.example#L37

+#### SMTP configuration
+
+If you're installing from source and use SMTP to deliver mail, you will need to add the following line
+to config/initializers/smtp_settings.rb:
+
+```ruby
+ActionMailer::Base.delivery_method = :smtp
+```
+
+See [smtp_settings.rb.sample] as an example.
+
+[smtp_settings.rb.sample]: https://gitlab.com/gitlab-org/gitlab-ce/blob/v8.9.0/config/initializers/smtp_settings.rb.sample#L13
+
 #### Init script

 Ensure you're still up-to-date with the latest init script changes: