diff --git a/CHANGELOG b/CHANGELOG index 8fa1fb000adfb2070609c357ef8cadb2f8f80d3e..1b17bcac32fee03e8299e6394a26799f96a39ed8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -37,6 +37,7 @@ v 7.0.0 - Remove wall feature (no data loss - you can take it from database) - Dont expose user emails via API unless you are admin - Detect issues closed by Merge Request description + - Better email subject lines from email on push service (Alex Elman) v 6.9.2 - Revert the commit that broke the LDAP user filter diff --git a/app/mailers/emails/projects.rb b/app/mailers/emails/projects.rb index 6017d9192ecaa37abae889988c2dad9b69f9b385..64878568ef85e63a1a5af6459703649c548ebe62 100644 --- a/app/mailers/emails/projects.rb +++ b/app/mailers/emails/projects.rb @@ -25,13 +25,15 @@ def repository_push_email(project_id, recipient, author_id, branch, compare) @branch = branch if @commits.length > 1 @target_url = project_compare_url(@project, from: @commits.first, to: @commits.last) + @subject = "#{@commits.length} new commits pushed to repository" else @target_url = project_commit_url(@project, @commits.first) + @subject = @commits.first.title end mail(from: sender(author_id), cc: recipient, - subject: subject("New push to repository")) + subject: subject(@subject)) end end end diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb index 453bf2b3e94218e3a49df26e6a445b9d40308c62..ab26b290d77b39b906486890e0652edfe51b08f5 100644 --- a/spec/mailers/notify_spec.rb +++ b/spec/mailers/notify_spec.rb @@ -537,7 +537,7 @@ end it 'has the correct subject' do - should have_subject /New push to repository/ + should have_subject /#{commits.length} new commits pushed to repository/ end it 'includes commits list' do @@ -573,7 +573,7 @@ end it 'has the correct subject' do - should have_subject /New push to repository/ + should have_subject /#{commits.first.title}/ end it 'includes commits list' do