diff options
| author | lambda <lain@soykaf.club> | 2019-04-12 10:41:09 +0000 |
|---|---|---|
| committer | lambda <lain@soykaf.club> | 2019-04-12 10:41:09 +0000 |
| commit | 184ae60b217f4e3a79aad538717d1cf35f10291a (patch) | |
| tree | ce7633ae3f388e1cf7618d39512a196ec59c93f3 /config | |
| parent | 0a09692c7decdcaa8c15e5f8eaf10d9e7d16a5e5 (diff) | |
| parent | 9c1b36856b97a7f86e60ad23ef374449c1910c7a (diff) | |
| download | pleroma-184ae60b217f4e3a79aad538717d1cf35f10291a.tar.gz pleroma-184ae60b217f4e3a79aad538717d1cf35f10291a.zip | |
Merge branch 'bugfix/pleroma-email-naming' into 'develop'
Make the filename and module name of Pleroma.Emails.* orthogonal
See merge request pleroma/pleroma!1029
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 2 | ||||
| -rw-r--r-- | config/dev.exs | 2 | ||||
| -rw-r--r-- | config/test.exs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/config/config.exs b/config/config.exs index 3462a37f7..343ecbc27 100644 --- a/config/config.exs +++ b/config/config.exs @@ -413,7 +413,7 @@ config :ueberauth, config :pleroma, :auth, oauth_consumer_strategies: oauth_consumer_strategies -config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Sendmail +config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Sendmail config :prometheus, Pleroma.Web.Endpoint.MetricsExporter, path: "/api/pleroma/app_metrics" diff --git a/config/dev.exs b/config/dev.exs index a7eb4b644..0432adce7 100644 --- a/config/dev.exs +++ b/config/dev.exs @@ -18,7 +18,7 @@ config :pleroma, Pleroma.Web.Endpoint, watchers: [], secure_cookie_flag: false -config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Local +config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Local # ## SSL Support # diff --git a/config/test.exs b/config/test.exs index 894fa8d3d..13a031d19 100644 --- a/config/test.exs +++ b/config/test.exs @@ -21,7 +21,7 @@ config :pleroma, Pleroma.Upload, filters: [], link_name: false config :pleroma, Pleroma.Uploaders.Local, uploads: "test/uploads" -config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Test +config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Test # Configure your database config :pleroma, Pleroma.Repo, |