nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:diaspora/diaspora_rails

Browse source
This commit is contained in:
maxwell 2010-07-16 10:39:18 -07:00
commit b39f7cebd0
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/user.rb
View file

@ -56,7 +56,7 @@ class User < Person
end end
def receive_friend_request(friend_request) def receive_friend_request(friend_request)
logger.info("receiving friend request #{friend_request.to_json}") Rails.logger.info("receiving friend request #{friend_request.to_json}")
GPGME.import(friend_request.exported_key) GPGME.import(friend_request.exported_key)
if Request.where(:callback_url => friend_request.callback_url).first if Request.where(:callback_url => friend_request.callback_url).first
friend_request.activate_friend friend_request.activate_friend