diff options
author | ThibG <thib@sitedethib.com> | 2018-07-10 10:52:18 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-10 10:52:18 +0200 |
commit | e6647ccf6d13030a91c7e635526e1e40a059ce31 (patch) | |
tree | eda07c40c934ab9a55d7847afe4af3e54bce86b8 /app/controllers/api/v1/follow_requests_controller.rb | |
parent | c699b2d141d7aa910bd81ae5fe881ecec7039395 (diff) | |
parent | 402da8065c2b378cca6361f2c7252bd766f25dde (diff) |
Merge pull request #557 from ThibG/glitch-soc/tentative-merge
Merge upstream changes
Diffstat (limited to 'app/controllers/api/v1/follow_requests_controller.rb')
-rw-r--r-- | app/controllers/api/v1/follow_requests_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/api/v1/follow_requests_controller.rb b/app/controllers/api/v1/follow_requests_controller.rb index d5c7c565a..313fe2f81 100644 --- a/app/controllers/api/v1/follow_requests_controller.rb +++ b/app/controllers/api/v1/follow_requests_controller.rb @@ -1,7 +1,8 @@ # frozen_string_literal: true class Api::V1::FollowRequestsController < Api::BaseController - before_action -> { doorkeeper_authorize! :follow } + before_action -> { doorkeeper_authorize! :follow, :'read:follows' }, only: :index + before_action -> { doorkeeper_authorize! :follow, :'write:follows' }, except: :index before_action :require_user! after_action :insert_pagination_headers, only: :index |