diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2016-10-03 21:38:25 +0300 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2016-10-03 21:38:25 +0300 |
commit | f39ba1bb5ed9c2421e60a618f71373c5d8dc94e9 (patch) | |
tree | e5ad67c48bdc2d520b84d735225ff7eac4c7da84 /app/mailers/emails | |
parent | db6b2b18990297d98bd74af1d2f475d0d42ec443 (diff) | |
parent | a1aea3266e4b90869d5a9bcc334272996ab80fda (diff) |
Merge remote-tracking branch 'upstream/master' into pipeline-emails
* upstream/master: (372 commits)
Enable Lint/StringConversionInInterpolation cop and autocorrect offenses
resolve duplicated changelog entry
credit myself :smile:
change determine conditions
override subject method in devise mailer
follow the styleguide: Don't use parentheses around a literal
wrap subject with method subject
move spec back into shared example `an email sent from GitLab`
stub config settings in spec
remove empty line at block body end
remove extra entry
create new test in `spec/mailers/notify_spec.rb`
move changelog to 8.13
add configurable email subject suffix
Fixes sidebar navigation.
Convert "SSH Keys" Spinach features to RSpec
Enable import/export back for non-admins
Update gitlab-shell to 3.6.3
Updated artwork of empty group state.
Better empty state for Groups view.
...
Diffstat (limited to 'app/mailers/emails')
-rw-r--r-- | app/mailers/emails/members.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/mailers/emails/members.rb b/app/mailers/emails/members.rb index 45311690293..7b617b359ea 100644 --- a/app/mailers/emails/members.rb +++ b/app/mailers/emails/members.rb @@ -45,7 +45,7 @@ module Emails @token = token mail(to: member.invite_email, - subject: "Invitation to join the #{member_source.human_name} #{member_source.model_name.singular}") + subject: subject("Invitation to join the #{member_source.human_name} #{member_source.model_name.singular}")) end def member_invite_accepted_email(member_source_type, member_id) |