Skip to content
Snippets Groups Projects
Commit e6722cb1 authored by Alex Elman's avatar Alex Elman
Browse files

Provide better email subject lines from email on push service

If one commit is pushed, display the commit message in the subject
line. Otherwise display the number of commits pushed to the repository.
parent 46e33ed3
No related branches found
No related tags found
No related merge requests found
Loading
@@ -37,6 +37,7 @@ v 7.0.0
Loading
@@ -37,6 +37,7 @@ v 7.0.0
- Remove wall feature (no data loss - you can take it from database) - Remove wall feature (no data loss - you can take it from database)
- Dont expose user emails via API unless you are admin - Dont expose user emails via API unless you are admin
- Detect issues closed by Merge Request description - Detect issues closed by Merge Request description
- Better email subject lines from email on push service (Alex Elman)
   
v 6.9.2 v 6.9.2
- Revert the commit that broke the LDAP user filter - Revert the commit that broke the LDAP user filter
Loading
Loading
Loading
@@ -25,13 +25,15 @@ module Emails
Loading
@@ -25,13 +25,15 @@ module Emails
@branch = branch @branch = branch
if @commits.length > 1 if @commits.length > 1
@target_url = project_compare_url(@project, from: @commits.first, to: @commits.last) @target_url = project_compare_url(@project, from: @commits.first, to: @commits.last)
@subject = "#{@commits.length} new commits pushed to repository"
else else
@target_url = project_commit_url(@project, @commits.first) @target_url = project_commit_url(@project, @commits.first)
@subject = @commits.first.title
end end
   
mail(from: sender(author_id), mail(from: sender(author_id),
cc: recipient, cc: recipient,
subject: subject("New push to repository")) subject: subject(@subject))
end end
end end
end end
Loading
@@ -537,7 +537,7 @@ describe Notify do
Loading
@@ -537,7 +537,7 @@ describe Notify do
end end
   
it 'has the correct subject' do it 'has the correct subject' do
should have_subject /New push to repository/ should have_subject /#{commits.length} new commits pushed to repository/
end end
   
it 'includes commits list' do it 'includes commits list' do
Loading
@@ -573,7 +573,7 @@ describe Notify do
Loading
@@ -573,7 +573,7 @@ describe Notify do
end end
   
it 'has the correct subject' do it 'has the correct subject' do
should have_subject /New push to repository/ should have_subject /#{commits.first.title}/
end end
   
it 'includes commits list' do it 'includes commits list' do
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment