diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-08-19 13:58:14 -0700 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-08-19 13:58:14 -0700 |
| commit | 34026c97b4d55026c414e839af926af3ffeb31cc (patch) | |
| tree | c4a6d47f3da07b40713c34729dd41aa4d6d42697 /config | |
| parent | f3b57ce677f016fbbbcc6426e33b2b61c34c068f (diff) | |
| download | gitlab-ce-34026c97b4d55026c414e839af926af3ffeb31cc.tar.gz | |
Add documentation.
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 2 | ||||
| -rw-r--r-- | config/mail_room.yml.example | 37 |
2 files changed, 26 insertions, 13 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index e78429b29a3..c7b60a1d4b1 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -95,6 +95,8 @@ production: &base # repository_downloads_path: tmp/repositories ## Reply by email + # Allow users to comment on issues and merge requests by replying to notification emails. + # For documentation on how to set this up, see http://doc.gitlab.com/ce/reply_by_email/README.md reply_by_email: enabled: false address: "replies+%{reply_key}@gitlab.example.com" diff --git a/config/mail_room.yml.example b/config/mail_room.yml.example index a7a6a25362e..28366eb7394 100644 --- a/config/mail_room.yml.example +++ b/config/mail_room.yml.example @@ -1,14 +1,25 @@ :mailboxes: - # - - # :host: "imap.gmail.com" - # :port: 993 - # :ssl: true - # :email: "replies@gitlab.example.com" - # :password: "password" - # :name: "inbox" - # :delivery_method: sidekiq - # :delivery_options: - # :redis_url: redis://localhost:6379 - # :namespace: resque:gitlab - # :queue: incoming_email - # :worker: EmailReceiverWorker + - + # # IMAP server host + # :host: "imap.gmail.com" + # # IMAP server port + # :port: 993 + # # Whether the IMAP server uses SSL + # :ssl: true + # # Email account username. Usually the full email address. + # :email: "replies@gitlab.example.com" + # # Email account password + # :password: "password" + # # The name of the mailbox where incoming mail will end up. Usually "inbox". + # :name: "inbox" + # # Always "sidekiq". + # :delivery_method: sidekiq + # :delivery_options: + # # The URL to the Redis server used by Sidekiq. Should match the URL in config/resque.yml. + # :redis_url: redis://localhost:6379 + # # Always "resque:gitlab". + # :namespace: resque:gitlab + # # Always "incoming_email". + # :queue: incoming_email + # # Always "EmailReceiverWorker" + # :worker: EmailReceiverWorker |