diff --git a/config/deploy_config.yml b/config/deploy_config.yml index 06a6747e1..c787e9257 100644 --- a/config/deploy_config.yml +++ b/config/deploy_config.yml @@ -6,7 +6,7 @@ cross_server: deploy_to: '/usr/local/app/diaspora' user: 'root' repo: 'git://github.com/diaspora/diaspora.git' - branch: 'master' + branch: 'contact-refactor' default_env: 'development' servers: tom: diff --git a/lib/diaspora/user/receiving.rb b/lib/diaspora/user/receiving.rb index 985346703..bcf8897f1 100644 --- a/lib/diaspora/user/receiving.rb +++ b/lib/diaspora/user/receiving.rb @@ -69,6 +69,7 @@ module Diaspora request.person = person request.person.save old_request = Request.first(:id => request.id) + Rails.logger.info("I got a reqest_id #{request.id} with old request #{old_request.inspect}") request.aspect_id = old_request.aspect_id if old_request request.save receive_friend_request(request)