whoops, taking out queue stuff untill i finish
This commit is contained in:
parent
242c6e4336
commit
f75bd6bc2e
2 changed files with 4 additions and 3 deletions
|
|
@ -72,7 +72,7 @@ module Diaspora
|
|||
activate_friend(friend_request.person, destination_aspect)
|
||||
Rails.logger.info("#{self.real_name}'s friend request has been accepted")
|
||||
friend_request.destroy
|
||||
Notifier.async.request_accepted(self, friend_request.person, destination_aspect).deliver.commit(1)
|
||||
Notifier.request_accepted(self, friend_request.person, destination_aspect)
|
||||
|
||||
#this is a new friend request
|
||||
elsif !from_me
|
||||
|
|
@ -80,7 +80,7 @@ module Diaspora
|
|||
self.save
|
||||
Rails.logger.info("#{self.real_name} has received a friend request")
|
||||
friend_request.save
|
||||
Notifier.async.new_request(self, friend_request.person).deliver.commit(1)
|
||||
Notifier.new_request(self, friend_request.person).deliver
|
||||
else
|
||||
Rails.logger.info("unsolicited friend request: #{friend_request.to_json}")
|
||||
end
|
||||
|
|
|
|||
|
|
@ -132,7 +132,8 @@ describe User do
|
|||
user.language.should == 'fr'
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
describe ".build" do
|
||||
context 'with valid params' do
|
||||
|
|
|
|||
Loading…
Reference in a new issue