Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge staging to main #36

Merged
merged 9 commits into from
Aug 25, 2023
Merged

Merge staging to main #36

merged 9 commits into from
Aug 25, 2023

Conversation

jpower432
Copy link
Member

@jpower432 jpower432 commented Aug 25, 2023

Description

Updates main with tested changes from #32

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

How has this been tested?

Integration: Verified internally (GitLab)
GH Actions:
Check - https://github.com/jpower432/cautious-potato/actions/runs/5979604539/job/16224025535
Assemble - https://github.com/jpower432/cautious-potato/actions/runs/5979604544
Regenerate - https://github.com/jpower432/cautious-potato/actions/runs/5979668360

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules

jpower432 and others added 9 commits August 11, 2023 15:17
PSCE-194 - Add create method to generate new system security plans with inheritance view
* chore: update base image

Signed-off-by: Jennifer Power <[email protected]>

* chore: change to major version

Signed-off-by: Jennifer Power <[email protected]>

---------

Signed-off-by: Jennifer Power <[email protected]>
Pin compliance-trestle to a commit

Signed-off-by: Jennifer Power <[email protected]>
@jpower432 jpower432 marked this pull request as ready for review August 25, 2023 19:30
@jpower432 jpower432 requested a review from afflom August 25, 2023 19:30
@afflom afflom merged commit 1d24f1d into main Aug 25, 2023
14 checks passed
@jpower432 jpower432 deleted the staging branch August 25, 2023 19:47
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.

2 participants