Add settings to disable email sending from GitLab.
This commit is contained in:
parent
2f6856f713
commit
d504ca8a0c
|
@ -39,6 +39,8 @@ production: &base
|
||||||
# time_zone: 'UTC'
|
# time_zone: 'UTC'
|
||||||
|
|
||||||
## Email settings
|
## Email settings
|
||||||
|
# Uncomment and set to false if you need to disable email sending from GitLab (default: true)
|
||||||
|
# email_enabled: true
|
||||||
# Email address used in the "From" field in mails sent by GitLab
|
# Email address used in the "From" field in mails sent by GitLab
|
||||||
email_from: example@example.com
|
email_from: example@example.com
|
||||||
|
|
||||||
|
|
|
@ -95,6 +95,7 @@ Settings.gitlab['https'] = false if Settings.gitlab['https'].nil?
|
||||||
Settings.gitlab['port'] ||= Settings.gitlab.https ? 443 : 80
|
Settings.gitlab['port'] ||= Settings.gitlab.https ? 443 : 80
|
||||||
Settings.gitlab['relative_url_root'] ||= ENV['RAILS_RELATIVE_URL_ROOT'] || ''
|
Settings.gitlab['relative_url_root'] ||= ENV['RAILS_RELATIVE_URL_ROOT'] || ''
|
||||||
Settings.gitlab['protocol'] ||= Settings.gitlab.https ? "https" : "http"
|
Settings.gitlab['protocol'] ||= Settings.gitlab.https ? "https" : "http"
|
||||||
|
Settings.gitlab['email_enabled'] ||= true if Settings.gitlab['email_enabled'].nil?
|
||||||
Settings.gitlab['email_from'] ||= "gitlab@#{Settings.gitlab.host}"
|
Settings.gitlab['email_from'] ||= "gitlab@#{Settings.gitlab.host}"
|
||||||
Settings.gitlab['url'] ||= Settings.send(:build_gitlab_url)
|
Settings.gitlab['url'] ||= Settings.send(:build_gitlab_url)
|
||||||
Settings.gitlab['user'] ||= 'git'
|
Settings.gitlab['user'] ||= 'git'
|
||||||
|
|
Loading…
Reference in New Issue