switch check out ref to merged commit

Author: labkey-willm

.github/workflows/copy_csp_blocks.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Check Out Code
         uses: actions/checkout@v4
         with:
-          ref: ${{ github.event.pull_request.head.ref }}
+          ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Copy CSP blocks into vars
         id: cspvars

server/configs/application.properties

@@ -161,4 +161,3 @@ csp.report=\
 ## File-based Tomcat HTTP access logs are enabled by default and use our recommended pattern. Override as needed.
 #server.tomcat.accesslog.enabled=false
 #server.tomcat.accesslog.pattern=%h %l %u %t "%r" %s %b %D %S %I "%{Referer}i" "%{User-Agent}i" %{LABKEY.username}s %{X-Forwarded-For}i
-