Skip to content

fix: resolve remaining dev/main conflicts for #427 (v3) #430

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

Merged
mpaulosky merged 3 commits into from
Jul 4, 2026
Merged

fix: resolve remaining dev/main conflicts for #427 (v3) #430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e1a700
refactor(apphost): extract WithClearDatabaseCommand into MongoDbResou…
mpaulosky Jul 2, 2026
6379007
merge: resolve dev/main conflicts for #427 (v3)
mpaulosky Jul 4, 2026
13d3399
ci: trigger required yamllint context for PR checks
mpaulosky Jul 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/squad-standard-lint-yaml.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
name: lint-yaml

Check warning on line 1 in .github/workflows/squad-standard-lint-yaml.yml

View workflow job for this annotation

GitHub Actions / lint-yaml 

1:1 [document-start] missing document start "---"

# Ensures YAML lint workflow runs on conflict-fix PRs that touch this file.
# Keep this workflow touched when resolving recurring PR context mismatches.

on:

Check warning on line 6 in .github/workflows/squad-standard-lint-yaml.yml

View workflow job for this annotation

GitHub Actions / lint-yaml 

6:1 [truthy] truthy value should be one of [false, true]
pull_request:
branches: [dev, main]
workflow_dispatch:
Expand All @@ -21,8 +22,8 @@
run: |
python -m pip install --quiet yamllint
if [ "${{ github.event_name }}" = "pull_request" ]; then
git fetch --no-tags origin "${{ github.base_ref }}:${{ github.base_ref }}"

Check failure on line 25 in .github/workflows/squad-standard-lint-yaml.yml

View workflow job for this annotation

GitHub Actions / lint-yaml 

25:81 [line-length] line too long (86 > 80 characters)
files=$(git diff --name-only "${{ github.base_ref }}...HEAD" -- '*.yml' '*.yaml')

Check failure on line 26 in .github/workflows/squad-standard-lint-yaml.yml

View workflow job for this annotation

GitHub Actions / lint-yaml 

26:81 [line-length] line too long (93 > 80 characters)
else
files=$(git ls-files '*.yml' '*.yaml')
fi
Expand Down
4 changes: 4 additions & 0 deletions src/Web/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading