diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-02-23 18:13:12 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-02-23 18:13:12 +0100 |
| commit | 3d25fe042679e7f5b9095983feb22f46e24c3033 (patch) | |
| tree | 18b57e7abf4f3edf55f057efd6eb47da698bf0f6 /config/initializers | |
| parent | 2c8615fbf8f8085eb836733b27b33c9522c29c71 (diff) | |
| parent | 0db101ede2eb9f8869932135785b0d83cd05560e (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.github/workflows/build-image.yml`: Upstream changed the workflow a bit. Conflict comes from us pushing to ghcr while upstream pushes to dockerhub. Ported the upstream changes while still pushing to ghcr.
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/preload_link_headers.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/preload_link_headers.rb b/config/initializers/preload_link_headers.rb index 9f21c45ec..364a7cc1b 100644 --- a/config/initializers/preload_link_headers.rb +++ b/config/initializers/preload_link_headers.rb @@ -2,7 +2,7 @@ # in the Links header per default. # In our case, that will bloat headers too much and potentially cause -# issues with reverse proxies. Furhermore, we don't need those links, +# issues with reverse proxies. Furthermore, we don't need those links, # as we already output them as HTML link tags. Rails.application.config.action_view.preload_links_header = false |