diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-06 15:59:21 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-06 15:59:21 +0300 |
| commit | 86ec49add45d95f67fda749758d07a26ee030989 (patch) | |
| tree | 1c2009ae71ffddb78538cdd8e608fc795d6f596d /config/gitlab.teatro.yml | |
| parent | 3f2282300d9c97e8c0c1df955bdd13d7ee1dc96e (diff) | |
| parent | b4be7aed7711e51becb3be29ed82d6753cc73cc4 (diff) | |
| download | gitlab-ce-86ec49add45d95f67fda749758d07a26ee030989.tar.gz | |
Merge pull request #8800 from jirutka/email-settings
Allow to configure smtp and sendmail in gitlab.yml
Diffstat (limited to 'config/gitlab.teatro.yml')
| -rw-r--r-- | config/gitlab.teatro.yml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/config/gitlab.teatro.yml b/config/gitlab.teatro.yml index f0656400beb..07133503843 100644 --- a/config/gitlab.teatro.yml +++ b/config/gitlab.teatro.yml @@ -7,8 +7,6 @@ production: &base user: root - email_from: example@example.com - support_email: support@example.com default_projects_features: @@ -19,6 +17,9 @@ production: &base snippets: false visibility_level: "private" # can be "private" | "internal" | "public" + outgoing_emails: + from: example@example.com + issues_tracker: gravatar: @@ -75,6 +76,8 @@ test: gitlab: host: localhost port: 80 + outgoing_emails: + delivery_method: :test issues_tracker: redmine: title: "Redmine" |