diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-02-21 23:36:04 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-02-21 23:36:04 +0300 |
| commit | deb62183edbd9111691f62a4f6a9febb1fcd79f7 (patch) | |
| tree | 8a788214a0286ce247670ff7694e6dff4f1d88d3 /lib | |
| parent | 7af8bb2608fddfacd54e215877780cb91cade93d (diff) | |
| parent | 649a1fcf15a239c08911040e355da112a33a2f31 (diff) | |
Merge branch '1363-redo-mailroom-support' into 'master'
Redo internals of Incoming Mail Support
See merge request !9385
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/tasks/gitlab/check.rake | 7 |
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 |