Commit 14a93616e464a7b39891dfb218dddbc808b32cda

Make the merge_request_notification mail subject reflect the proper user

Commit diff


23	23
24	24	def merge_request_notification(merge_request)
25	25	setup_email(merge_request.target_repository.user)
26		~~@subject += %Q{#{merge_request.target_repository.user.login} has requested a merge in #{merge_request.target_repository.project.title}}~~
	26	@subject += %Q{#{merge_request.source_repository.user.login} has requested a merge in #{merge_request.target_repository.project.title}}
27	27	@body[:merge_request] = merge_request
28	28	@body[:project] = merge_request.target_repository.project
29	29	url = "http://gitorious.org/p/#{merge_request.target_repository.project.slug}"
toggle raw diff
--- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -23,7 +23,7 @@ class Mailer < ActionMailer::Base def merge_request_notification(merge_request) setup_email(merge_request.target_repository.user) - @subject += %Q{#{merge_request.target_repository.user.login} has requested a merge in #{merge_request.target_repository.project.title}} + @subject += %Q{#{merge_request.source_repository.user.login} has requested a merge in #{merge_request.target_repository.project.title}} @body[:merge_request] = merge_request @body[:project] = merge_request.target_repository.project url = "http://gitorious.org/p/#{merge_request.target_repository.project.slug}"


50	50	mail = Mailer.create_merge_request_notification(merge_request)
51	51
52	52	mail.to.should == [merge_request.target_repository.user.email]
53		~~mail.subject.should == "[Gitorious] johan has requested a merge in johans project"~~
	53	mail.subject.should == "[Gitorious] moe has requested a merge in johans project"
54	54	mail.body.should match(/moe has requested that you merge #{merge_request.source_repository.name} with #{merge_request.target_repository.name}/)
55	55	mail.body.should match(/in the #{merge_request.target_repository.project.title} project/)
56	56
toggle raw diff
--- a/spec/models/mailer_spec.rb +++ b/spec/models/mailer_spec.rb @@ -50,7 +50,7 @@ describe Mailer do mail = Mailer.create_merge_request_notification(merge_request) mail.to.should == [merge_request.target_repository.user.email] - mail.subject.should == "[Gitorious] johan has requested a merge in johans project" + mail.subject.should == "[Gitorious] moe has requested a merge in johans project" mail.body.should match(/moe has requested that you merge #{merge_request.source_repository.name} with #{merge_request.target_repository.name}/) mail.body.should match(/in the #{merge_request.target_repository.project.title} project/)