diff options
| author | ThibG <thib@sitedethib.com> | 2020-06-09 13:00:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-09 13:00:24 +0200 |
| commit | 3287a10fe9658a6c370431a925abc50d4f68ea08 (patch) | |
| tree | 88a408a943aa421a6ba844d309f673150cd92434 /config/initializers | |
| parent | f328f2faa3fbdb182921366c6a20e745c069b840 (diff) | |
| parent | e9d7ca7645fc37534df1222e8d7ab8f3d533b852 (diff) | |
Merge pull request #1350 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/doorkeeper.rb | 3 | ||||
| -rw-r--r-- | config/initializers/inflections.rb | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb index e03380cec..63cff7c59 100644 --- a/config/initializers/doorkeeper.rb +++ b/config/initializers/doorkeeper.rb @@ -95,7 +95,8 @@ Doorkeeper.configure do :'admin:read:reports', :'admin:write', :'admin:write:accounts', - :'admin:write:reports' + :'admin:write:reports', + :crypto # Change the way client credentials are retrieved from the request object. # By default it retrieves first from the `HTTP_AUTHORIZATION` header, then diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb index 0667a542c..ebb7541eb 100644 --- a/config/initializers/inflections.rb +++ b/config/initializers/inflections.rb @@ -19,6 +19,7 @@ ActiveSupport::Inflector.inflections(:en) do |inflect| inflect.acronym 'ActivityStreams' inflect.acronym 'JsonLd' inflect.acronym 'NodeInfo' + inflect.acronym 'Ed25519' inflect.singular 'data', 'data' end |