Commit 61ef1fca authored by Maksim's avatar Maksim

remove duplicate module

parent 67ab9a79
......@@ -118,6 +118,8 @@
streaming_enabled: true,
public_endpoint: nil
config :tzdata, :autoupdate, :disabled
if File.exists?("./config/test.secret.exs") do
import_config "test.secret.exs"
# Pleroma: A lightweight social networking server
# Copyright © 2017-2020 Pleroma Authors <>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Config.Utils do
alias Pleroma.Config
def instance_name, do: Config.get([:instance, :name])
defp instance_notify_email do
Config.get([:instance, :notify_email]) || Config.get([:instance, :email])
def sender do
{instance_name(), instance_notify_email()}
......@@ -11,7 +11,7 @@ defmodule Pleroma.User.WelcomeEmail do
alias Pleroma.Emails
alias Pleroma.User
import Pleroma.Config.Utils, only: [instance_name: 0]
import Pleroma.Config.Helpers, only: [instance_name: 0]
@spec enabled?() :: boolean()
def enabled?, do: Config.get([:welcome, :email, :enabled], false)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment