about summary refs log tree commit diff
path: root/app/controllers/api/v1
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-08-31 19:10:57 +0200
committerThibaut Girka <thib@sitedethib.com>2018-08-31 19:10:57 +0200
commit6f75a9001f6ba8e47c80767d8406cfeb11a79690 (patch)
tree7f988360fd5b6aefa1ddd4255926bb20025fd27f /app/controllers/api/v1
parentc6942a528332e99b605efa95ffa1c710324d368c (diff)
parent55880c70981bac9278e7f8584f9d4ecd78f1ba6b (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/views/stream_entries/_simple_status.html.haml
- config/locales/nl.yml

Deleted unused translation strings (themes) and adapted minor changes to
_simple_status.html.haml
Diffstat (limited to 'app/controllers/api/v1')
-rw-r--r--app/controllers/api/v1/follow_requests_controller.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/api/v1/follow_requests_controller.rb b/app/controllers/api/v1/follow_requests_controller.rb
index 313fe2f81..e9aca5f8a 100644
--- a/app/controllers/api/v1/follow_requests_controller.rb
+++ b/app/controllers/api/v1/follow_requests_controller.rb
@@ -13,6 +13,7 @@ class Api::V1::FollowRequestsController < Api::BaseController
 
   def authorize
     AuthorizeFollowService.new.call(account, current_account)
+    NotifyService.new.call(current_account, Follow.find_by(account: account, target_account: current_account))
     render_empty
   end