diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-03-19 14:34:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-19 14:34:08 +0100 |
| commit | c7f04961b6dcb1b7e12136deadcf65076c130c40 (patch) | |
| tree | 20788cbb86d4ae8d38ce539325205e5f0a1ee344 /config/initializers | |
| parent | ba22398c38067e05f141a0dddeb20bf68913988a (diff) | |
| parent | 3b7b607300d662aa1f25d459ca12aec89ab550e8 (diff) | |
Merge pull request #1513 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/inflections.rb | 4 | ||||
| -rw-r--r-- | config/initializers/sidekiq.rb | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb index ebb7541eb..9bc9a54b2 100644 --- a/config/initializers/inflections.rb +++ b/config/initializers/inflections.rb @@ -20,6 +20,10 @@ ActiveSupport::Inflector.inflections(:en) do |inflect| inflect.acronym 'JsonLd' inflect.acronym 'NodeInfo' inflect.acronym 'Ed25519' + inflect.acronym 'TOC' + inflect.acronym 'RSS' + inflect.acronym 'REST' + inflect.acronym 'URL' inflect.singular 'data', 'data' end diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 9d348ddd0..fc85a3913 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true namespace = ENV.fetch('REDIS_NAMESPACE') { nil } -redis_params = { url: ENV['REDIS_URL'] } +redis_params = { url: ENV['REDIS_URL'], driver: :hiredis } if namespace redis_params[:namespace] = namespace |