Skip to content
Extraits de code Groupes Projets
Valider f75bd6bc rédigé par maxwell's avatar maxwell
Parcourir les fichiers

whoops, taking out queue stuff untill i finish

parent 242c6e43
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -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
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter