Permalink
Browse files

Merge branch 'master' of git://github.com/nivedred/24pullrequests int…

…o nivedred-master

* 'master' of git://github.com/nivedred/24pullrequests:
  Fixed
  Working on that damn rebase
  fixed gitignore
  Changed the :From headers on the reminder emails.

Conflicts:
	.gitignore
  • Loading branch information...
2 parents 8e96615 + 44525d8 commit 1f09f118b8cbe86ad3ad95c94cd67c10885dc8d2 @andrew andrew committed Dec 19, 2012
Showing with 7 additions and 4 deletions.
  1. +4 −1 .gitignore
  2. +1 −1 app/mailers/reminder_mailer.rb
  3. +2 −2 spec/mailers/reminder_mailer_spec.rb
View
@@ -7,8 +7,11 @@
# Ignore all logfiles and tempfiles.
/log/*.log
/tmp
+
coverage
.idea
# Ignore ds_store
-.DS_Store
+.DS_Store
+
+Thumbs.db
@@ -1,6 +1,6 @@
class ReminderMailer < ActionMailer::Base
- default :from => "info@24pullrequests.com"
+ default :from => "24 Pull Requests <info@24pullrequests.com>"
def daily(user)
@user = user
@@ -20,7 +20,7 @@
end
it 'renders the sender email' do
- mail.from.should == ['info@24pullrequests.com']
+ mail.from.should == ['24 Pull Requests <info@24pullrequests.com>']
end
it 'uses nickname' do
@@ -51,7 +51,7 @@
end
it 'renders the sender email' do
- mail.from.should == ['info@24pullrequests.com']
+ mail.from.should == ['24 Pull Requests <info@24pullrequests.com>']
end
it 'uses nickname' do

0 comments on commit 1f09f11

Please sign in to comment.