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 /spec/fixtures/config | |
parent | e03a7c53aedfb8f5c9afcf71e1e2e071084b3f56 (diff) | |
download | gitlab-ce-e49d55e96116deebcd757c5d833b679918a38127.tar.gz |
Use newer mail_room to get `require_relative` support
Diffstat (limited to 'spec/fixtures/config')
-rw-r--r-- | spec/fixtures/config/mail_room_disabled.yml | 11 | ||||
-rw-r--r-- | spec/fixtures/config/mail_room_enabled.yml | 11 |
2 files changed, 22 insertions, 0 deletions
diff --git a/spec/fixtures/config/mail_room_disabled.yml b/spec/fixtures/config/mail_room_disabled.yml new file mode 100644 index 00000000000..97f8cff051f --- /dev/null +++ b/spec/fixtures/config/mail_room_disabled.yml @@ -0,0 +1,11 @@ +test: + incoming_email: + enabled: false + address: "gitlab-incoming+%{key}@gmail.com" + user: "gitlab-incoming@gmail.com" + password: "[REDACTED]" + host: "imap.gmail.com" + port: 993 + ssl: true + start_tls: false + mailbox: "inbox" diff --git a/spec/fixtures/config/mail_room_enabled.yml b/spec/fixtures/config/mail_room_enabled.yml new file mode 100644 index 00000000000..9c94649244d --- /dev/null +++ b/spec/fixtures/config/mail_room_enabled.yml @@ -0,0 +1,11 @@ +test: + incoming_email: + enabled: true + address: "gitlab-incoming+%{key}@gmail.com" + user: "gitlab-incoming@gmail.com" + password: "[REDACTED]" + host: "imap.gmail.com" + port: 993 + ssl: true + start_tls: false + mailbox: "inbox" |