Commit c6eb1c1b authored by feld's avatar feld

Merge branch 'develop' into fix/cache-control-headers

parents 7321429a 096c5c52
......@@ -12,7 +12,7 @@ defmodule Pleroma.Web.Endpoint do
@static_cache_control "public max-age=86400 must-revalidate"
@static_cache_control "public, no-cache"
# InstanceStatic needs to be before Plug.Static to be able to override shipped-static files
# If you're adding new paths to `only:` you'll need to configure them in InstanceStatic as well
......@@ -9,7 +9,7 @@ defmodule Pleroma.Web.CacheControlTest do
test "Verify Cache-Control header on static assets", %{conn: conn} do
conn = get(conn, "/index.html")
assert Conn.get_resp_header(conn, "cache-control") == ["public max-age=86400 must-revalidate"]
assert Conn.get_resp_header(conn, "cache-control") == ["public, no-cache"]
test "Verify Cache-Control header on the API", %{conn: conn} do
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment