diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-21 20:29:14 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-21 20:29:14 +0300 |
| commit | 36f49305e1159e1d14b0b19c309242dbade258e1 (patch) | |
| tree | ab889c13178ec2e8f5a8c3e65c56bfb9305cee46 /doc/development | |
| parent | aa168687a29e9f42a764878b98942857d9b353bb (diff) | |
| parent | 152e6b73cade1bc6507e05f2498d79ef6218ac6e (diff) | |
Merge branch 'docs/clarify-mail-room-procfile-location' into 'master'
Clarify location of Procfile for mail_room
See merge request gitlab-org/gitlab-ce!17896
Diffstat (limited to 'doc/development')
| -rw-r--r-- | doc/development/emails.md | 10 |
1 files changed, 2 insertions, 8 deletions
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: |