Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mastodon
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
Model registry
Operate
Environments
Terraform modules
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
Pierre Boudes
mastodon
Commits
5466b39c
Commit
5466b39c
authored
5 years ago
by
Hugo Gameiro
Committed by
Eugen Rochko
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Add SMTP reply_to option (#11718)
* Add SMTP_REPLY_TO in .env.production.sample * Set reply_to in SMTP options
parent
1f22b819
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.env.production.sample
+1
-0
1 addition, 0 deletions
.env.production.sample
config/environments/production.rb
+4
-1
4 additions, 1 deletion
config/environments/production.rb
with
5 additions
and
1 deletion
.env.production.sample
+
1
−
0
View file @
5466b39c
...
...
@@ -69,6 +69,7 @@ SMTP_PORT=587
SMTP_LOGIN=
SMTP_PASSWORD=
SMTP_FROM_ADDRESS=notifications@example.com
#SMTP_REPLY_TO=
#SMTP_DOMAIN= # defaults to LOCAL_DOMAIN
#SMTP_DELIVERY_METHOD=smtp # delivery method can also be sendmail
#SMTP_AUTH_METHOD=plain
...
...
This diff is collapsed.
Click to expand it.
config/environments/production.rb
+
4
−
1
View file @
5466b39c
...
...
@@ -83,7 +83,10 @@ Rails.application.configure do
config
.
action_mailer
.
perform_caching
=
false
# E-mails
config
.
action_mailer
.
default_options
=
{
from:
ENV
.
fetch
(
'SMTP_FROM_ADDRESS'
,
'notifications@localhost'
)
}
config
.
action_mailer
.
default_options
=
{
from:
ENV
.
fetch
(
'SMTP_FROM_ADDRESS'
,
'notifications@localhost'
),
reply_to:
ENV
[
'SMTP_REPLY_TO'
]
}
config
.
action_mailer
.
smtp_settings
=
{
:port
=>
ENV
[
'SMTP_PORT'
],
...
...
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