diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-04-03 17:21:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-03 17:21:33 +0200 |
| commit | 8192b0da7cd1fac38a68eab6746fc7ec74328a77 (patch) | |
| tree | 686c30ed5f6c4cfe5f6b4d84e46ff19f7baa6949 /config/initializers | |
| parent | cbdb25ab0343603165fc89fd28b07c9ca0f2ae6d (diff) | |
| parent | 7b15f4006adb5f8f04d83174532c30eeb78757b0 (diff) | |
Merge pull request #2155 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/inflections.rb | 1 | ||||
| -rw-r--r-- | config/initializers/paperclip.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb index a361cb0ec..95f0b5788 100644 --- a/config/initializers/inflections.rb +++ b/config/initializers/inflections.rb @@ -26,6 +26,7 @@ ActiveSupport::Inflector.inflections(:en) do |inflect| inflect.acronym 'URL' inflect.acronym 'ASCII' inflect.acronym 'DeepL' + inflect.acronym 'DSL' inflect.singular 'data', 'data' end diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb index 9282c941d..bd37f6709 100644 --- a/config/initializers/paperclip.rb +++ b/config/initializers/paperclip.rb @@ -130,6 +130,7 @@ elsif ENV['SWIFT_ENABLED'] == 'true' openstack_domain_name: ENV.fetch('SWIFT_DOMAIN_NAME') { 'default' }, openstack_region: ENV['SWIFT_REGION'], openstack_cache_ttl: ENV.fetch('SWIFT_CACHE_TTL') { 60 }, + openstack_temp_url_key: ENV['SWIFT_TEMP_URL_KEY'], }, fog_file: { 'Cache-Control' => 'public, max-age=315576000, immutable' }, |