diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-06-18 13:41:12 +0200 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-06-18 13:41:12 +0200 |
| commit | 780d868fec936327cbdf688cf6e2571b07d780c9 (patch) | |
| tree | 415dce6a51954def59111fce1eeeae84d5e3d187 /spec/services/issues | |
| parent | c1ff1fdeff2692bfb0d3210709aa2df1421f0516 (diff) | |
| download | gitlab-ce-780d868fec936327cbdf688cf6e2571b07d780c9.tar.gz | |
Revert "Merge branch 'fix-email-threading' into 'master'"
This reverts commit 97fd990ecde387290be269ef7daafa5761f94af6, reversing
changes made to f451a697e0c018359e6d8ff3aaba4eb0484c4bee.
Conflicts:
app/mailers/emails/notes.rb
app/mailers/emails/projects.rb
Diffstat (limited to 'spec/services/issues')
| -rw-r--r-- | spec/services/issues/close_service_spec.rb | 2 | ||||
| -rw-r--r-- | spec/services/issues/update_service_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/services/issues/close_service_spec.rb b/spec/services/issues/close_service_spec.rb index 7324650d534..d4f2cc1339b 100644 --- a/spec/services/issues/close_service_spec.rb +++ b/spec/services/issues/close_service_spec.rb @@ -22,7 +22,7 @@ describe Issues::CloseService do it 'should send email to user2 about assign of new issue' do email = ActionMailer::Base.deliveries.last - email.cc.first.should == user2.email + email.to.first.should == user2.email email.subject.should include(issue.title) end diff --git a/spec/services/issues/update_service_spec.rb b/spec/services/issues/update_service_spec.rb index 47d18565034..347560414e7 100644 --- a/spec/services/issues/update_service_spec.rb +++ b/spec/services/issues/update_service_spec.rb @@ -31,7 +31,7 @@ describe Issues::UpdateService do it 'should send email to user2 about assign of new issue' do email = ActionMailer::Base.deliveries.last - email.cc.first.should == user2.email + email.to.first.should == user2.email email.subject.should include(issue.title) end |