Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
funkwhale
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
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
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
vachan-maker
funkwhale
Commits
909d16c2
Commit
909d16c2
authored
4 years ago
by
jovuit
Committed by
Georg Krause
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Resolve "EMAIL_CONFIG not documented"
fixes #1481
parent
1ef252e2
No related branches found
No related tags found
No related merge requests found
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
CHANGELOG
+2
-2
2 additions, 2 deletions
CHANGELOG
api/config/settings/common.py
+131
-89
131 additions, 89 deletions
api/config/settings/common.py
changes/changelog.d/1481.doc
+1
-0
1 addition, 0 deletions
changes/changelog.d/1481.doc
docs/admin/configuration.rst
+9
-0
9 additions, 0 deletions
docs/admin/configuration.rst
with
143 additions
and
91 deletions
CHANGELOG
+
2
−
2
View file @
909d16c2
...
@@ -3298,12 +3298,12 @@ Email sending is disabled by default, as it requires additional configuration.
...
@@ -3298,12 +3298,12 @@ Email sending is disabled by default, as it requires additional configuration.
In this mode, emails are simply outputed on stdout.
In this mode, emails are simply outputed on stdout.
If you want to actually send those emails to your users, you should edit your
If you want to actually send those emails to your users, you should edit your
.env file and tweak the EMAIL_CONFIG variable. See :
ref:`setting-
EMAIL_CONFIG`
.env file and tweak the
``
EMAIL_CONFIG
``
variable. See :
data:`EMAIL_CONFIG <config.settings.common.
EMAIL_CONFIG
>
`
for more details.
for more details.
.. note::
.. note::
As a result of these changes, the DJANGO_EMAIL_BACKEND variable,
As a result of these changes, the
``
DJANGO_EMAIL_BACKEND
``
variable,
which was not documented, has no effect anymore. You can safely remove it from
which was not documented, has no effect anymore. You can safely remove it from
your .env file if it is set.
your .env file if it is set.
...
...
This diff is collapsed.
Click to expand it.
api/config/settings/common.py
+
131
−
89
View file @
909d16c2
This diff is collapsed.
Click to expand it.
changes/changelog.d/1481.doc
0 → 100644
+
1
−
0
View file @
909d16c2
Added email configuration to the documentation (#1481)
This diff is collapsed.
Click to expand it.
docs/admin/configuration.rst
+
9
−
0
View file @
909d16c2
...
@@ -163,6 +163,15 @@ Subsonic
...
@@ -163,6 +163,15 @@ Subsonic
.. autodata:: config.settings.common.SUBSONIC_DEFAULT_TRANSCODING_FORMAT
.. autodata:: config.settings.common.SUBSONIC_DEFAULT_TRANSCODING_FORMAT
Email configuration
^^^^^^^^^^^^^^^^^^^
.. autodata:: config.settings.common.EMAIL_CONFIG
:annotation: = consolemail://
.. autodata:: config.settings.common.DEFAULT_FROM_EMAIL
:annotation: = Funkwhale <noreply@yourdomain>
.. autodata:: config.settings.common.EMAIL_SUBJECT_PREFIX
Other settings
Other settings
^^^^^^^^^^^^^^
^^^^^^^^^^^^^^
...
...
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