summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Mazetto <brodock@gmail.com>2017-02-21 18:50:28 +0100
committerGabriel Mazetto <brodock@gmail.com>2017-02-21 18:50:28 +0100
commit649a1fcf15a239c08911040e355da112a33a2f31 (patch)
tree24c9becdf8c8364a1e42336db2f06521f8c52bc1
parent9d7615d04e0e4fc2fd8da69be482877dd9cd7349 (diff)
downloadgitlab-ce-1363-redo-mailroom-support.tar.gz
Fix incomming email check task to use same patch we did in mail_room1363-redo-mailroom-support
-rw-r--r--lib/tasks/gitlab/check.rake7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index 35c4194e87c..6102517e730 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -724,8 +724,11 @@ namespace :gitlab do
def check_imap_authentication
print "IMAP server credentials are correct? ... "
- config_path = Rails.root.join('config', 'mail_room.yml')
- config_file = YAML.load(ERB.new(File.read(config_path)).result)
+ config_path = Rails.root.join('config', 'mail_room.yml').to_s
+ erb = ERB.new(File.read(config_path))
+ erb.filename = config_path
+ config_file = YAML.load(erb.result)
+
config = config_file[:mailboxes].first
if config