Merge branch 'master' into 'master'
Make email display name configurable #216 See merge request !80
This commit is contained in:
commit
94affe6d51
5 changed files with 7 additions and 2 deletions
|
@ -47,6 +47,8 @@ v 7.9.0 (unreleased)
|
||||||
- Fix highliht of selected lines in file
|
- Fix highliht of selected lines in file
|
||||||
- Reject access to group/project avatar if the user doesn't have access.
|
- Reject access to group/project avatar if the user doesn't have access.
|
||||||
- Add database migration to clean group duplicates with same path and name (Make sure you have a backup before update)
|
- Add database migration to clean group duplicates with same path and name (Make sure you have a backup before update)
|
||||||
|
- Starred projects page at dashboard
|
||||||
|
- Make email display name configurable
|
||||||
|
|
||||||
v 7.8.2
|
v 7.8.2
|
||||||
- Fix service migration issue when upgrading from versions prior to 7.3
|
- Fix service migration issue when upgrading from versions prior to 7.3
|
||||||
|
|
|
@ -53,7 +53,7 @@ class Notify < ActionMailer::Base
|
||||||
# The default email address to send emails from
|
# The default email address to send emails from
|
||||||
def default_sender_address
|
def default_sender_address
|
||||||
address = Mail::Address.new(Gitlab.config.gitlab.email_from)
|
address = Mail::Address.new(Gitlab.config.gitlab.email_from)
|
||||||
address.display_name = "GitLab"
|
address.display_name = Gitlab.config.gitlab.email_display_name
|
||||||
address
|
address
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -43,6 +43,7 @@ production: &base
|
||||||
# email_enabled: 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
|
||||||
|
email_display_name: GitLab
|
||||||
|
|
||||||
# Email server smtp settings are in config/initializers/smtp_settings.rb.sample
|
# Email server smtp settings are in config/initializers/smtp_settings.rb.sample
|
||||||
|
|
||||||
|
|
|
@ -102,6 +102,7 @@ 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_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['email_display_name'] ||= "GitLab"
|
||||||
Settings.gitlab['url'] ||= Settings.send(:build_gitlab_url)
|
Settings.gitlab['url'] ||= Settings.send(:build_gitlab_url)
|
||||||
Settings.gitlab['user'] ||= 'git'
|
Settings.gitlab['user'] ||= 'git'
|
||||||
Settings.gitlab['user_home'] ||= begin
|
Settings.gitlab['user_home'] ||= begin
|
||||||
|
|
|
@ -5,6 +5,7 @@ describe Notify do
|
||||||
include EmailSpec::Matchers
|
include EmailSpec::Matchers
|
||||||
include RepoHelpers
|
include RepoHelpers
|
||||||
|
|
||||||
|
let(:gitlab_sender_display_name) { Gitlab.config.gitlab.email_display_name }
|
||||||
let(:gitlab_sender) { Gitlab.config.gitlab.email_from }
|
let(:gitlab_sender) { Gitlab.config.gitlab.email_from }
|
||||||
let(:recipient) { create(:user, email: 'recipient@example.com') }
|
let(:recipient) { create(:user, email: 'recipient@example.com') }
|
||||||
let(:project) { create(:project) }
|
let(:project) { create(:project) }
|
||||||
|
@ -23,7 +24,7 @@ describe Notify do
|
||||||
shared_examples 'an email sent from GitLab' do
|
shared_examples 'an email sent from GitLab' do
|
||||||
it 'is sent from GitLab' do
|
it 'is sent from GitLab' do
|
||||||
sender = subject.header[:from].addrs[0]
|
sender = subject.header[:from].addrs[0]
|
||||||
expect(sender.display_name).to eq('GitLab')
|
expect(sender.display_name).to eq(gitlab_sender_display_name)
|
||||||
expect(sender.address).to eq(gitlab_sender)
|
expect(sender.address).to eq(gitlab_sender)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue