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.

Sign up for GitHub

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

Jump to bottom

Merge stable back into develop with resolved pyproject conflicts #5651

Merged
merged 12 commits into from
Feb 3, 2025
Merged

Merge stable back into develop with resolved pyproject conflicts #5651

merged 12 commits into from
Feb 3, 2025

Conversation

ogenstad
Copy link
Contributor

@ogenstad ogenstad commented Feb 2, 2025 •
edited
Loading

Replaces #5635.

  • Fixed merge conflict for project.toml files
  • Fix test that needed to be updated f67c876

ogenstad and others added 11 commits January 30, 2025 15:58
@ogenstad
Loosen requirements of token verification for OIDC id_token groups
62b07b1 
Fixes #5623
@ogenstad
Merge pull request #5624 from opsmill/pog-loosen-requirements-for-oic…
39bc69d 
…d-IFC-1194

Loosen requirements of token verification for OIDC id_token groups
@fatih-acar
fix(ci): disable test tracing
9f881df 
https://github.blog/changelog/2024-04-16-deprecation-notice-v3-of-the-artifact-actions/

Signed-off-by: Fatih Acar <fatih@opsmill.com>
@opsmill-bot
chore: update submodule python_sdk to version v1.7.1 (#5629)
c5e8e73
@lykinsbd
release 1.1.6 prep (#5633)
b1e0d2f
@opsmill-bot
chore: update docker-compose and helm chart
46b404d
@petercrocker
change docs to sync from local repos (#5632)
9dfaf83 
* change docs to sync from local repos
* move media file to infrahub-sync repo
@bilalabbad
Added data-testid on filter buttons of pc diff view (#5644)
dc877ff
@ajtmccarty
update diff logic to handle schema kind migration (#5634)
be13145
@petercrocker
move integrations to other repos (#5649)
f964cb8 
* move integrations to other repos
* fix broken link
@ogenstad
Fix pyproject merge conflicts
3c5a011
@github-actions github-actions bot added type/documentation Improvements or additions to documentation group/backend Issue related to the backend (API Server, Git Agent) group/frontend Issue related to the frontend (React) labels Feb 2, 2025
@ogenstad ogenstad mentioned this pull request Feb 2, 2025
Closed
@codspeed-hq CodSpeed HQ
Copy link

codspeed-hq bot commented Feb 2, 2025 •
edited
Loading

CodSpeed Performance Report

Merging #5651 will not alter performance

Comparing pog-stable-into-develop-20250202 (f67c876) with develop (f1b18ba)

Summary

✅ 11 untouched benchmarks

@ogenstad ogenstad marked this pull request as ready for review February 2, 2025 20:06
@ogenstad ogenstad requested review from a team as code owners February 2, 2025 20:06
@ogenstad ogenstad requested review from a team and removed request for a team February 2, 2025 20:06
@dgarros dgarros merged commit 0fc9497 into develop Feb 3, 2025
36 checks passed
@dgarros dgarros deleted the pog-stable-into-develop-20250202 branch February 3, 2025 10:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dgarros dgarros dgarros approved these changes

Assignees
No one assigned
Labels
group/backend Issue related to the backend (API Server, Git Agent) group/frontend Issue related to the frontend (React) type/documentation Improvements or additions to documentation
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@ogenstad @dgarros @fatih-acar @opsmill-bot @lykinsbd @petercrocker @bilalabbad @ajtmccarty