kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'docs/clarify-mail-room-procfile-location' into 'master'

Browse source 
Clarify location of Procfile for mail_room

See merge request gitlab-org/gitlab-ce!17896
This commit is contained in:
Sean McGivern 2018-03-21 17:29:14 +00:00
commit 36f49305e1
2 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Procfile
View file

@ -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

10
doc/development/emails.md
View file

@ -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: