Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
pleroma
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Maksim
pleroma
Commits
61ef1fca
Commit
61ef1fca
authored
Jul 24, 2020
by
Maksim
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove duplicate module
parent
67ab9a79
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
18 deletions
+3
-18
config/test.exs
config/test.exs
+2
-0
lib/pleroma/config/utils.ex
lib/pleroma/config/utils.ex
+0
-17
lib/pleroma/user/welcome_email.ex
lib/pleroma/user/welcome_email.ex
+1
-1
No files found.
config/test.exs
View file @
61ef1fca
...
...
@@ -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"
else
...
...
lib/pleroma/config/utils.ex
deleted
100644 → 0
View file @
67ab9a79
# Pleroma: A lightweight social networking server
# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
# 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
])
end
def
sender
do
{
instance_name
(),
instance_notify_email
()}
end
end
lib/pleroma/user/welcome_email.ex
View file @
61ef1fca
...
...
@@ -11,7 +11,7 @@ defmodule Pleroma.User.WelcomeEmail do
alias
Pleroma
.
Emails
alias
Pleroma
.
User
import
Pleroma
.
Config
.
Util
s
,
only:
[
instance_name:
0
]
import
Pleroma
.
Config
.
Helper
s
,
only:
[
instance_name:
0
]
@spec
enabled?
()
::
boolean
()
def
enabled?
,
do
:
Config
.
get
([
:welcome
,
:email
,
:enabled
],
false
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment