From e49d55e96116deebcd757c5d833b679918a38127 Mon Sep 17 00:00:00 2001 From: Gabriel Mazetto Date: Mon, 20 Feb 2017 17:37:50 +0100 Subject: Use newer mail_room to get `require_relative` support --- config/mail_room.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'config/mail_room.yml') 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? -- cgit v1.2.1