chore: merge production into staging#696
Merged
Merged
Conversation
Initial production deploy
feat: add production deployment configuration for Google Cloud
Bumps [authlib](https://github.com/authlib/authlib) from 1.6.1 to 1.6.4. - [Release notes](https://github.com/authlib/authlib/releases) - [Changelog](https://github.com/authlib/authlib/blob/main/docs/changelog.rst) - [Commits](authlib/authlib@v1.6.1...v1.6.4) --- updated-dependencies: - dependency-name: authlib dependency-version: 1.6.4 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
…lib-1.6.4 build(deps): bump authlib from 1.6.1 to 1.6.4
Update dependabot.yml
Bumps [authlib](https://github.com/authlib/authlib) from 1.6.4 to 1.6.5. - [Release notes](https://github.com/authlib/authlib/releases) - [Changelog](https://github.com/authlib/authlib/blob/main/docs/changelog.rst) - [Commits](authlib/authlib@v1.6.4...v1.6.5) --- updated-dependencies: - dependency-name: authlib dependency-version: 1.6.5 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
…lib-1.6.5 build(deps): bump authlib from 1.6.4 to 1.6.5
test release 0.1
Maintenance Push
Feature collection Views
V1 Production Launch
V1.0.0.1 release
<!-- - Title the PR with the JIRA project & ticket number and short description (e.g., BDMS-123: Example display bug), or NO TICKET - Keep sections short and scannable. --> ### **Why** _This PR addresses the following problem / context:_ - Use bullet points here ### **How** _Implementation summary - the following was changed / added / removed:_ - Use bullet points here ### **Notes** _Any special considerations, workarounds, or follow-up work to note?_ - Use bullet points here --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Jeremy Zilar <jeremyzilar@gmail.com> Co-authored-by: jeremyzilar <395641+jeremyzilar@users.noreply.github.com> Co-authored-by: Jeremy Zilar <jeremy.zilar@lakeraven.com> Co-authored-by: Kelsey Smuczynski <ksmuczynski@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tyler Adam Martinez <TylerAdamMartinez@outlook.com> Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com> Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
# Conflicts: # .github/workflows/pr-title-lint.yml # .github/workflows/release-please.yml # pyproject.toml # requirements.txt # uv.lock
jirhiker
added a commit
that referenced
this pull request
Jun 8, 2026
### Why - Re-resolve conflicts blocking [#695](#695). [#696](#696) was squash-merged, which stripped the merge commit, so `production` is still not an ancestor of `staging` and PR #695 re-reports CONFLICTING. ### How - Real merge commit of `origin/production` into `staging`. - Same resolutions as #696: keep staging versions (authlib 1.7.2, idna 3.18, semantic-pull-request@v6, release-please-action@v5). - `uv lock --check` passes. ### Notes - **MUST be merged via "Create a merge commit"** — not squash, not rebase. Squashing this PR again will reproduce the same conflict on #695. --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jacob Brown <29125483+jacob-a-brown@users.noreply.github.com> Co-authored-by: Jeremy Zilar <jeremyzilar@gmail.com> Co-authored-by: jeremyzilar <395641+jeremyzilar@users.noreply.github.com> Co-authored-by: Jeremy Zilar <jeremy.zilar@lakeraven.com> Co-authored-by: Kelsey Smuczynski <ksmuczynski@gmail.com> Co-authored-by: Tyler Adam Martinez <TylerAdamMartinez@outlook.com> Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com> Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
This was referenced Jun 8, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Why
How
origin/productionintostaging.pyproject.toml,requirements.txt,uv.lock,.github/workflows/pr-title-lint.yml,.github/workflows/release-please.ymlby keeping the newer staging versions (authlib 1.7.2, idna 3.18, semantic-pull-request@v6, release-please-action@v5).uv lock --checkpasses.Notes