Skip to content
Merged
Show file tree
Hide file tree
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 .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ jobs:
make archive
if [ ! -f "wire-docs.tar.gz" ]; then
echo "Artifact not found!"
mv wire-docs.tar.gz wire-docs-${{ github.ref_name }}.tar.gz
exit 1
fi
mv wire-docs.tar.gz wire-docs-${{ github.ref_name }}.tar.gz

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
Expand Down
173 changes: 0 additions & 173 deletions src/understand/associate/deeplink.md

This file was deleted.

1 change: 1 addition & 0 deletions src/understand/associate/deeplink.md
2 changes: 1 addition & 1 deletion wire-server
Submodule wire-server updated 65 files
+4 −4 CODEOWNERS
+1 −0 changelog.d/2-features/WPB-16211
+1 −1 changelog.d/2-features/WPB-16388
+2 −0 changelog.d/2-features/WPB-16420_multi-ingress_sso
+3 −0 changelog.d/3-bug-fixes/multi-ingress_minio-ingress
+15 −0 charts/nginx-ingress-services/templates/_helpers.tpl
+1 −1 charts/nginx-ingress-services/templates/ingress_minio.yaml
+0 −15 charts/nginz/templates/conf/_deeplink.html.tpl
+0 −33 charts/nginz/templates/conf/_deeplink.json.tpl
+3 −2 charts/nginz/templates/conf/_nginx.conf.tpl
+94 −7 charts/nginz/templates/configmap.yaml
+6 −0 charts/nginz/templates/deployment.yaml
+32 −7 charts/nginz/values.yaml
+27 −0 charts/spar/templates/_helpers.tpl
+16 −4 charts/spar/templates/configmap.yaml
+36 −0 charts/spar/values.yaml
+111 −4 docs/src/developer/reference/config-options.md
+222 −0 docs/src/understand/associate/deeplink.md
+2 −0 integration/integration.cabal
+6 −3 integration/test/API/Galley.hs
+18 −6 integration/test/API/Spar.hs
+56 −28 integration/test/SetupHelpers.hs
+14 −0 integration/test/Test/Channels.hs
+190 −0 integration/test/Test/Spar/MultiIngressSSO.hs
+21 −0 integration/test/Testlib/KleisliXML.hs
+5 −0 libs/saml2-web-sso/default.nix
+5 −0 libs/saml2-web-sso/saml2-web-sso.cabal
+9 −5 libs/saml2-web-sso/src/SAML2/WebSSO/API.hs
+1 −1 libs/saml2-web-sso/src/SAML2/WebSSO/API/Example.hs
+138 −35 libs/saml2-web-sso/src/SAML2/WebSSO/Config.hs
+20 −0 libs/saml2-web-sso/src/SAML2/WebSSO/Orphans.hs
+13 −24 libs/saml2-web-sso/src/SAML2/WebSSO/SP.hs
+6 −1 libs/saml2-web-sso/src/SAML2/WebSSO/Test/Arbitrary.hs
+1 −1 libs/saml2-web-sso/src/SAML2/WebSSO/Test/Util/VendorCompatibility.hs
+28 −0 libs/saml2-web-sso/src/SAML2/WebSSO/Types.hs
+1 −1 libs/saml2-web-sso/test/Test/SAML2/WebSSO/APISpec.hs
+80 −5 libs/saml2-web-sso/test/Test/SAML2/WebSSO/ConfigSpec.hs
+6 −1 libs/wire-api/src/Wire/API/Conversation.hs
+5 −2 libs/wire-api/src/Wire/API/Routes/Public.hs
+71 −10 libs/wire-api/src/Wire/API/Routes/Public/Spar.hs
+4 −2 libs/wire-api/test/golden/Test/Wire/API/Golden/Generated/NewConv_user.hs
+1 −0 libs/wire-api/test/golden/testObject_NewConv_user_3.json
+1 −0 libs/wire-api/test/golden/testObject_NewConv_v2_user_3.json
+15 −1 services/brig/test/integration/API/OAuth.hs
+1 −1 services/brig/test/integration/API/Provider.hs
+1 −0 services/brig/test/integration/API/Team/Util.hs
+1 −0 services/brig/test/integration/Util.hs
+1 −1 services/galley/src/Galley/API/Create.hs
+2 −0 services/galley/test/integration/API.hs
+7 −1 services/galley/test/integration/API/Util.hs
+2 −2 services/spar/default.nix
+3 −1 services/spar/spar.cabal
+2 −0 services/spar/spar.integration.yaml
+58 −5 services/spar/src/Spar/API.hs
+3 −0 services/spar/src/Spar/Error.hs
+8 −42 services/spar/src/Spar/Options.hs
+1 −1 services/spar/src/Spar/Scim/User.hs
+1 −1 services/spar/src/Spar/Sem/SAML2.hs
+3 −2 services/spar/src/Spar/Sem/SAML2/Library.hs
+5 −2 services/spar/src/Spar/Sem/SamlProtocolSettings.hs
+3 −2 services/spar/src/Spar/Sem/SamlProtocolSettings/Servant.hs
+1 −1 services/spar/test-integration/Test/Spar/APISpec.hs
+1 −1 services/spar/test-integration/Util/Core.hs
+27 −0 services/spar/test/Arbitrary.hs
+78 −0 services/spar/test/Test/Spar/Sem/SamlProtocolSettingsSpec.hs
Loading