[ODM-11818] Merge develop

Oleg Kunitsyn · Oleg Kunitsyn · commit 79ff8ecf2102 · 2025-01-16T09:46:07.000+01:00
diff --git a/docs/home/release-notes/v1.50-v1.59.md b/docs/home/release-notes/v1.50-v1.59.md
@@ -3,7 +3,7 @@
 ## Version 1.60
 
 !!! tip ""
-    Helm chart version 1.60.x
+Helm chart version 1.60.x
 
 ### Rclone Migration
 
@@ -13,10 +13,16 @@ As a result of this migration, the configuration of storages was moved from `fun
 You can find configuration examples in the "examples" directory within the Helm chart.
 Note that the configuration section `genestack.rclone` in all three of these services should be identical. For this purpose, we recommend using YAML anchors, which are also included in the examples.
 
+## SAML elimitaion
+
+Support of SAML was eliminated.
+
+### Helm configuration changes
+
 ## Version 1.59
 
 !!! tip ""
-    Helm chart version 1.59.2
+    Helm chart version 1.59.4
 
 ### Helm configuration changes
 
diff --git a/docs/home/single-sign-on/saml/google.md b/docs/home/single-sign-on/saml/google.md
diff --git a/docs/home/single-sign-on/saml/okta.md b/docs/home/single-sign-on/saml/okta.md
diff --git a/docs/home/single-sign-on/sso.md b/docs/home/single-sign-on/sso.md
@@ -1,11 +1,9 @@
 # About SSO in ODM
 
-For authentication, ODM supports the OpenID and SAML.
+For authentication, ODM supports the OpenID.
 
 For user and group synchronization, it supports the SCIM.
 
 !!! attention "Important information"
 
-    - ODM can work with only one protocol (OpenID or SAML) at a time.
-
     - With OpenID, you can use OAuth tokens to connect to the ODM API ([documentation for Azure](./openid/azure.md#configure-oauth-resource-server))
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -17,9 +17,6 @@ nav:
                 - Microsoft Azure: home/single-sign-on/openid/azure.md
                 - Google Workspace: home/single-sign-on/openid/google.md
                 - Okta: home/single-sign-on/openid/okta.md
-            - SAML:
-                - Google Workspace: home/single-sign-on/saml/google.md
-                - Okta: home/single-sign-on/saml/okta.md
             - SCIM:
                 - Microsoft Azure: home/single-sign-on/scim/azure.md
         - Helm:
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
-mkdocs-material==9.5.47
+mkdocs-material==9.5.49
 mike==2.1.3
 
 # https://github.com/squidfunk/mkdocs-material/issues/3085#issuecomment-933373590
-Jinja2==3.1.4
+Jinja2==3.1.5
