diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-02-21 20:36:04 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-02-21 20:36:04 +0000 |
| commit | deb62183edbd9111691f62a4f6a9febb1fcd79f7 (patch) | |
| tree | 8a788214a0286ce247670ff7694e6dff4f1d88d3 /config | |
| parent | 7af8bb2608fddfacd54e215877780cb91cade93d (diff) | |
| parent | 649a1fcf15a239c08911040e355da112a33a2f31 (diff) | |
| download | gitlab-ce-deb62183edbd9111691f62a4f6a9febb1fcd79f7.tar.gz | |
Merge branch '1363-redo-mailroom-support' into 'master'
Redo internals of Incoming Mail Support
See merge request !9385
Diffstat (limited to 'config')
| -rw-r--r-- | config/mail_room.yml | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/config/mail_room.yml b/config/mail_room.yml index 774c5350a45..88d93d4bc6b 100644 --- a/config/mail_room.yml +++ b/config/mail_room.yml @@ -1,9 +1,6 @@ -# If you change this file in a Merge Request, please also create -# a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests -# :mailboxes: <% - require_relative "lib/gitlab/mail_room" unless defined?(Gitlab::MailRoom) + require_relative "../lib/gitlab/mail_room" unless defined?(Gitlab::MailRoom) config = Gitlab::MailRoom.config if Gitlab::MailRoom.enabled? |