Skip to content
Merged
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion wire-server
Submodule wire-server updated 56 files
+5 −5 Makefile
+3 −0 changelog.d/2-features/WPB-19751
+1 −0 changelog.d/2-features/WPB-20003
+1 −0 changelog.d/2-features/user-type
+1 −0 changelog.d/5-internal/graceful-shutdown-gundeck
+4 −0 charts/galley/templates/configmap.yaml
+4 −1 charts/galley/values.yaml
+5 −0 charts/gundeck/templates/deployment.yaml
+3 −0 charts/gundeck/values.yaml
+20 −0 docs/src/developer/reference/config-options.md
+190 −55 docs/src/understand/configure-federation.md
+1 −2 hack/bin/cabal-run-integration.sh
+1 −0 integration/integration.cabal
+9 −0 integration/test/API/Brig.hs
+0 −2 integration/test/API/Spar.hs
+14 −2 integration/test/Test/Apps.hs
+22 −0 integration/test/Test/FeatureFlags/SimplifiedUserConnectionRequestQRCode.hs
+2 −1 integration/test/Test/FeatureFlags/Util.hs
+41 −2 integration/test/Test/UserGroup.hs
+1 −4 integration/test/Testlib/Run.hs
+7 −0 libs/galley-types/src/Galley/Types/Teams.hs
+415 −0 libs/wire-api/src/Wire/API/PostgresMarshall.hs
+1 −0 libs/wire-api/src/Wire/API/Routes/Internal/Galley.hs
+1 −0 libs/wire-api/src/Wire/API/Routes/Public/Galley/Feature.hs
+28 −1 libs/wire-api/src/Wire/API/Team/Feature.hs
+46 −19 libs/wire-api/src/Wire/API/User.hs
+4 −2 libs/wire-api/test/golden/Test/Wire/API/Golden/Generated/UserProfile_user.hs
+4 −2 libs/wire-api/test/golden/Test/Wire/API/Golden/Manual/ListUsersById.hs
+4 −2 libs/wire-api/test/golden/testObject_ListUsersById_user_2.json
+2 −1 libs/wire-api/test/golden/testObject_ListUsersById_user_3.json
+2 −1 libs/wire-api/test/golden/testObject_UserProfile_user_1.json
+2 −1 libs/wire-api/test/golden/testObject_UserProfile_user_2.json
+1 −1 libs/wire-api/test/unit/Test/Wire/API/User.hs
+1 −0 libs/wire-api/wire-api.cabal
+26 −1 libs/wire-subsystems/src/Wire/AppStore.hs
+19 −8 libs/wire-subsystems/src/Wire/AppStore/Postgres.hs
+9 −3 libs/wire-subsystems/src/Wire/AppSubsystem/Interpreter.hs
+12 −0 libs/wire-subsystems/src/Wire/Postgres.hs
+0 −27 libs/wire-subsystems/src/Wire/PostgresMarshall.hs
+2 −0 libs/wire-subsystems/src/Wire/UserGroupStore.hs
+49 −30 libs/wire-subsystems/src/Wire/UserGroupStore/Postgres.hs
+1 −0 libs/wire-subsystems/src/Wire/UserGroupSubsystem.hs
+51 −28 libs/wire-subsystems/src/Wire/UserGroupSubsystem/Interpreter.hs
+12 −1 libs/wire-subsystems/src/Wire/UserSubsystem/Interpreter.hs
+12 −0 libs/wire-subsystems/test/unit/Wire/MiniBackend.hs
+1 −0 libs/wire-subsystems/test/unit/Wire/MockInterpreters.hs
+16 −0 libs/wire-subsystems/test/unit/Wire/MockInterpreters/AppStore.hs
+10 −1 libs/wire-subsystems/test/unit/Wire/MockInterpreters/UserGroupStore.hs
+1 −1 libs/wire-subsystems/wire-subsystems.cabal
+2 −2 services/brig/src/Brig/API/Public.hs
+2 −1 services/brig/test/integration/API/User/Account.hs
+2 −0 services/galley/src/Galley/API/Internal.hs
+1 −0 services/galley/src/Galley/API/Public/Feature.hs
+2 −0 services/galley/src/Galley/API/Teams/Features.hs
+2 −0 services/galley/src/Galley/API/Teams/Features/Get.hs
+2 −1 services/galley/test/integration/API/Util.hs