copilot-swe-agent[bot] d34b8bceb9 fix(config): remove duplicate dictionary keys and class fields from merge ...

Remove duplicate SETTING_METADATA entries (db_pool_size, db_max_overflow,
db_pool_timeout, db_pool_recycle, upload_rate_limit_per_user,
upload_rate_limit_window) that were introduced when merging origin/main.
Also remove duplicate Settings class field definitions in config.py.

Fixes ruff F601 (repeated dictionary key literal) errors.

Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com>

2026-03-19 11:07:03 +00:00

..

api

fix: resolve merge conflict in database.py

2026-03-19 10:40:43 +00:00

middleware

fix: resolve merge conflict in database.py

2026-03-19 10:40:43 +00:00

tasks

merge: resolve conflicts with main branch (keep both SharePoint + iCloud integrations)

2026-03-16 22:25:51 +00:00

templates/email

fix(merge): resolve tests/test_auth.py conflict keeping all tests from both branches

2026-03-08 11:11:21 +00:00

utils

fix(config): remove duplicate dictionary keys and class fields from merge

2026-03-19 11:07:03 +00:00

views

Merge branch 'main' into copilot/implement-log-off-everywhere-functionality

2026-03-17 12:12:50 +01:00

__init__.py

feat: add frontend views and file management functionality, enhance user response structure, and update configuration guide

2025-04-03 21:49:15 +02:00

auth.py

feat(api): allow disabled tokens/devices to be deleted & reactivated; add token lifetime

2026-03-18 23:43:16 +00:00

celery_app.py

refactor(tasks): address code review feedback for notification dispatch

2026-03-16 16:23:06 +00:00

celery_worker.py

merge: resolve conflicts with main branch (keep both SharePoint + iCloud integrations)

2026-03-16 22:25:51 +00:00

cli.py

feat(cli): add docuelevate CLI tool for power users

2026-03-08 21:50:18 +00:00

config.py

fix(config): remove duplicate dictionary keys and class fields from merge

2026-03-19 11:07:03 +00:00

database.py

fix: resolve merge conflict in database.py

2026-03-19 10:40:43 +00:00

frontend.py

style: fix all flake8 linter errors across app/ directory

2026-02-08 17:42:33 +00:00

main.py

Merge branch 'main' into copilot/implement-log-off-everywhere-functionality

2026-03-17 12:12:50 +01:00

models.py

feat(api): allow disabled tokens/devices to be deleted & reactivated; add token lifetime

2026-03-18 23:43:16 +00:00