diff options
| author | Starfall <admin@plural.cafe> | 2020-06-19 13:14:45 -0500 |
|---|---|---|
| committer | Starfall <admin@plural.cafe> | 2020-06-19 13:14:45 -0500 |
| commit | 5668836f56cddf3257f38a2483c1d42cacbad3a8 (patch) | |
| tree | c241a44562f79ccecaf215eb572c22d559b08dd1 /config/initializers | |
| parent | 76f79dd29909d39f1d36ef48e6892223d59e29d7 (diff) | |
| parent | c7da2cc5a1821e589e7241aec21d8bb426722c2a (diff) | |
Merge branch 'glitch' into main
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/doorkeeper.rb | 3 | ||||
| -rw-r--r-- | config/initializers/inflections.rb | 1 | ||||
| -rw-r--r-- | config/initializers/redis.rb | 2 |
3 files changed, 5 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 diff --git a/config/initializers/redis.rb b/config/initializers/redis.rb index 7573fc9f7..510194044 100644 --- a/config/initializers/redis.rb +++ b/config/initializers/redis.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +Redis.exists_returns_integer = false + redis_connection = Redis.new( url: ENV['REDIS_URL'], driver: :hiredis |