Skip to content

[bot] Merge 25.2 to develop#138

Merged
github-actions[bot] merged 2 commits intodevelopfrom
fb_bot_merge_25.2
Feb 19, 2025
Merged

[bot] Merge 25.2 to develop#138
github-actions[bot] merged 2 commits intodevelopfrom
fb_bot_merge_25.2

Conversation

@github-actions
Copy link

Generated automatically.
Merging changes from: 4fd4333
Approve all matching PRs simultaneously.
Approval will trigger automatic merge.
Verify all PRs before approving: https://internal.labkey.com/Scrumtime/Backlog/harvest-gitOpenPullRequests.view?branch=fb_bot_merge_25.2

labkey-willm and others added 2 commits February 14, 2025 20:59
* add default csp.enforce block and ability to load an optional.application.properties

* remove CSP_REPORT and CSP_ENFORCE; update README

* add wiring for optional app properties file from s3

* update to match what's currently deployed

* Update README.md



---------

Co-authored-by: labkey-stuartm <32204841+labkey-stuartm@users.noreply.github.com>
@github-actions github-actions bot merged commit 6170b69 into develop Feb 19, 2025
1 check passed
@github-actions github-actions bot deleted the fb_bot_merge_25.2 branch February 19, 2025 19:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants