Commit 36f49305 authored by Sean McGivern's avatar Sean McGivern

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
parents aa168687 152e6b73
Pipeline #19275406 passed with stages
in 47 minutes and 39 seconds
......@@ -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
......@@ -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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment