Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
pleroma
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
jeff
pleroma
Commits
a64eb2b3
Commit
a64eb2b3
authored
6 years ago
by
Alexander Strizhakov
Browse files
Options
Downloads
Patches
Plain Diff
fallback to the old behaviour
admin and user mailers
parent
fe511a6c
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
lib/pleroma/emails/admin_email.ex
+4
-1
4 additions, 1 deletion
lib/pleroma/emails/admin_email.ex
lib/pleroma/emails/user_email.ex
+2
-1
2 additions, 1 deletion
lib/pleroma/emails/user_email.ex
with
6 additions
and
2 deletions
lib/pleroma/emails/admin_email.ex
+
4
−
1
View file @
a64eb2b3
...
...
@@ -11,7 +11,10 @@ defmodule Pleroma.AdminEmail do
defp
instance_config
,
do
:
Pleroma
.
Config
.
get
(
:instance
)
defp
instance_name
,
do
:
instance_config
()[
:name
]
defp
instance_notify_email
,
do
:
instance_config
()[
:notify_email
]
defp
instance_notify_email
do
Keyword
.
get
(
instance_config
(),
:notify_email
,
instance_config
()[
:email
])
end
defp
user_url
(
user
)
do
Helpers
.
o_status_url
(
Pleroma
.
Web
.
Endpoint
,
:feed_redirect
,
user
.
nickname
)
...
...
This diff is collapsed.
Click to expand it.
lib/pleroma/emails/user_email.ex
+
2
−
1
View file @
a64eb2b3
...
...
@@ -15,7 +15,8 @@ defmodule Pleroma.UserEmail do
defp
instance_name
,
do
:
instance_config
()[
:name
]
defp
sender
do
{
instance_name
(),
instance_config
()[
:notify_email
]}
email
=
Keyword
.
get
(
instance_config
(),
:notify_email
,
instance_config
()[
:email
])
{
instance_name
(),
email
}
end
defp
recipient
(
email
,
nil
),
do
:
email
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment