Skip to content

Commit

Permalink
Merge main into stable/4.1.x. Update 20240208
Browse files Browse the repository at this point in the history
* commit '1e5514a1529886dfe9d66239e71d7de6f1ffcf26': (28 commits)
  Bump eslint-plugin-jsdoc from 48.0.5 to 48.0.6 in /auth (OpenSlides#274)
  Bump the typescript-eslint group in /auth with 2 updates (OpenSlides#272)
  Bump eslint-plugin-jsdoc from 48.0.4 to 48.0.5 in /auth (OpenSlides#273)
  Bump prettier from 3.2.4 to 3.2.5 in /auth (OpenSlides#271)
  Fix internal auth password encoding in dev mode (OpenSlides#270)
  Bump @types/jest from 29.5.11 to 29.5.12 in /auth (OpenSlides#269)
  Bump the opentelemetry group in /auth with 1 update (OpenSlides#268)
  Bump the typescript-eslint group in /auth with 2 updates (OpenSlides#267)
  Bump black from 24.1.0 to 24.1.1 in /auth/libraries/pip-auth (OpenSlides#266)
  Bump pytest from 7.4.4 to 8.0.0 in /auth/libraries/pip-auth (OpenSlides#265)
  Bump @types/pg from 8.10.9 to 8.11.0 in /auth (OpenSlides#262)
  Bump axios from 1.6.6 to 1.6.7 in /auth (OpenSlides#261)
  Bump eslint-plugin-jsdoc from 48.0.3 to 48.0.4 in /auth (OpenSlides#263)
  Bump the opentelemetry group in /auth with 4 updates (OpenSlides#260)
  Enable merge queue (OpenSlides#264)
  Bump black from 23.12.1 to 24.1.0 in /auth/libraries/pip-auth (OpenSlides#259)
  Bump types-requests in /auth/libraries/pip-auth (OpenSlides#258)
  Bump eslint-plugin-jsdoc from 48.0.2 to 48.0.3 in /auth (OpenSlides#257)
  Bump axios from 1.6.5 to 1.6.6 in /auth (OpenSlides#256)
  Bump @types/superagent from 8.1.2 to 8.1.3 in /auth (OpenSlides#255)
  ...
  • Loading branch information
peb-adr committed Feb 8, 2024
2 parents d2aee74 + 1e5514a commit d5272d2
Show file tree
Hide file tree
Showing 6 changed files with 476 additions and 514 deletions.
3 changes: 3 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ updates:
typescript-eslint:
patterns:
- "@typescript-eslint/*"
opentelemetry:
patterns:
- "@opentelemetry/*"
open-pull-requests-limit: 42

- package-ecosystem: "docker"
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ name: CI
on:
pull_request:
branches: [main]
merge_group:
types: [checks_requested]

jobs:
build-and-test-prod-image:
Expand Down
6 changes: 3 additions & 3 deletions auth/libraries/pip-auth/requirements_development.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
autoflake==2.2.1
black==23.12.1
black==24.1.1
flake8==7.0.0
isort==5.13.2
mypy==1.8.0
pytest==7.4.4
pytest==8.0.0

types-redis==4.6.0.20240106
types-requests==2.31.0.20240106
types-requests==2.31.0.20240125
Loading

0 comments on commit d5272d2

Please sign in to comment.