diff options
| author | ThibG <thib@sitedethib.com> | 2018-10-24 11:28:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-24 11:28:25 +0200 |
| commit | 0e8de56a22aee089da8aa1c64bab941bc5911e5d (patch) | |
| tree | ac3f4100e27a9341c32c15e07661af841c547ec0 /config/initializers | |
| parent | 4739e0f090a04235669ef81fa432ae90bb62f4c4 (diff) | |
| parent | ed8d06212f439b9fe2f170a6f43d6be6d586ff80 (diff) | |
Merge pull request #792 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/content_security_policy.rb | 1 | ||||
| -rw-r--r-- | config/initializers/doorkeeper.rb | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb index b3b9efb2a..76236aa21 100644 --- a/config/initializers/content_security_policy.rb +++ b/config/initializers/content_security_policy.rb @@ -31,7 +31,6 @@ if Rails.env.production? end end - # Report CSP violations to a specified URI # For further information see the following documentation: # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb index c77387ed4..2a963b32b 100644 --- a/config/initializers/doorkeeper.rb +++ b/config/initializers/doorkeeper.rb @@ -59,6 +59,7 @@ Doorkeeper.configure do :'write:accounts', :'write:blocks', :'write:bookmarks', + :'write:conversations', :'write:favourites', :'write:filters', :'write:follows', @@ -78,7 +79,6 @@ Doorkeeper.configure do :'read:lists', :'read:mutes', :'read:notifications', - :'read:reports', :'read:search', :'read:statuses', :follow, |