diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-06-28 13:11:26 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-06-28 13:11:26 +0000 |
| commit | 9315597adb22be9ddac019ca014edcde871b84e1 (patch) | |
| tree | fb254de948b2034a49bdd64fa414876a9e26e66c | |
| parent | 365015e3c935afd8e4d3073078712cccd3077204 (diff) | |
| parent | 3be80540aa61cf030f86163534a3a5a63a7fb30e (diff) | |
| download | gitlab-ce-9315597adb22be9ddac019ca014edcde871b84e1.tar.gz | |
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
| -rw-r--r-- | doc/update/8.8-to-8.9.md | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/doc/update/8.8-to-8.9.md b/doc/update/8.8-to-8.9.md index f14046bb4be..423140a92c7 100644 --- 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: |