diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2018-03-20 21:33:28 -0500 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2018-03-21 11:52:05 -0500 |
| commit | 152e6b73cade1bc6507e05f2498d79ef6218ac6e (patch) | |
| tree | 3d0cc331e27cde54692ffd957b2ba1241acc5e39 | |
| parent | 956bd6a45861dccc40591e02cf36e895a6fc4f5b (diff) | |
| download | gitlab-ce-152e6b73cade1bc6507e05f2498d79ef6218ac6e.tar.gz | |
Launch mail_room manually and remove foreman reference
| -rw-r--r-- | Procfile | 1 | ||||
| -rw-r--r-- | doc/development/emails.md | 10 |
2 files changed, 2 insertions, 9 deletions
@@ -4,4 +4,3 @@ # web: RAILS_ENV=development bin/web start_foreground worker: RAILS_ENV=development bin/background_jobs start_foreground -# mail_room: bundle exec mail_room -q -c config/mail_room.yml diff --git a/doc/development/emails.md b/doc/development/emails.md index 677029b1295..4dbf064fd75 100644 --- a/doc/development/emails.md +++ b/doc/development/emails.md @@ -60,16 +60,10 @@ See the [Rails guides] for more info. As mentioned, the part after `+` is ignored, and this will end up in the mailbox for `gitlab-incoming@gmail.com`. -1. Uncomment the `mail_room` line in your `Procfile`: - - ```yaml - mail_room: bundle exec mail_room -q -c config/mail_room.yml - ``` - -1. Restart GitLab: +1. Run this command in the GitLab root directory to launch `mail_room`: ```sh - bundle exec foreman start + bundle exec mail_room -q -c config/mail_room.yml ``` 1. Verify that everything is configured correctly: |