diff options
| author | Gabriel Mazetto <brodock@gmail.com> | 2017-02-20 17:37:50 +0100 |
|---|---|---|
| committer | Gabriel Mazetto <brodock@gmail.com> | 2017-02-20 17:38:21 +0100 |
| commit | e49d55e96116deebcd757c5d833b679918a38127 (patch) | |
| tree | 26521a53cbad9173387ef85896b19ea2ecfdf498 /config | |
| parent | e03a7c53aedfb8f5c9afcf71e1e2e071084b3f56 (diff) | |
| download | gitlab-ce-e49d55e96116deebcd757c5d833b679918a38127.tar.gz | |
Use newer mail_room to get `require_relative` support
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? |