diff options
| author | Ruben Davila <rdavila84@gmail.com> | 2017-05-25 18:22:45 +0300 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2017-05-25 18:22:45 +0300 |
| commit | 5c921809cd86e1031a6a5075da142fef3bb01d6d (patch) | |
| tree | 0c04cf9d24f9e94c2bf5dfd709c22f142bec5e77 /app/mailers/base_mailer.rb | |
| parent | d07e85e1033f8026f155c6171cb3ebcd6b93d9ed (diff) | |
Bugfix: Always use the default language when generating emails.
There was a race condition issue when the application was generating an
email and was using a language that was previously being used in other
request.
Diffstat (limited to 'app/mailers/base_mailer.rb')
| -rw-r--r-- | app/mailers/base_mailer.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/mailers/base_mailer.rb b/app/mailers/base_mailer.rb index d2980db218a..654468bc7fe 100644 --- a/app/mailers/base_mailer.rb +++ b/app/mailers/base_mailer.rb @@ -1,4 +1,6 @@ class BaseMailer < ActionMailer::Base + around_action :render_with_default_locale + helper ApplicationHelper helper MarkupHelper @@ -14,6 +16,10 @@ class BaseMailer < ActionMailer::Base private + def render_with_default_locale(&block) + Gitlab::I18n.with_default_locale(&block) + end + def default_sender_address address = Mail::Address.new(Gitlab.config.gitlab.email_from) address.display_name = Gitlab.config.gitlab.email_display_name |