diff --git a/_docs/master/api.html b/_docs/master/api.html index 138fc49e65..f948e685db 100644 --- a/_docs/master/api.html +++ b/_docs/master/api.html @@ -15980,9 +15980,14 @@ "type" : "integer", "minimum" : 1 } + }, + "ui_display_type" : { + "default" : "cron/raw", + "type" : "string", + "enum" : [ "cron/raw", "cron/builder" ] } }, - "required" : [ "name", "schedule" ] + "required" : [ "name", "schedule", "ui_display_type" ] } } } @@ -16085,6 +16090,10 @@ "type" : "integer", "minimum" : 1 } + }, + "ui_display_type" : { + "type" : "string", + "enum" : [ "cron/raw", "cron/builder" ] } } } diff --git a/_docs/master/people-and-groups/user-provisioning.md b/_docs/master/people-and-groups/user-provisioning.md index 941d0681b8..3c85ad302b 100644 --- a/_docs/master/people-and-groups/user-provisioning.md +++ b/_docs/master/people-and-groups/user-provisioning.md @@ -32,7 +32,7 @@ Click on the **User provisioning** tab. To set up user provisioning with SCIM, hit the toggle to enable it. Metabase will tell you the SCIM endpoint URL and SCIM token to share with your identity provider. -> If you've previously set up user provisioning with SAML, Metabase will turn that setting off and use the SCIM setup instead. +> SAML user provisioning is always disabled when SCIM is enabled. ## SCIM endpoint URL diff --git a/_site/docs/master/api.html b/_site/docs/master/api.html index af4f225359..4b471f2e80 100644 --- a/_site/docs/master/api.html +++ b/_site/docs/master/api.html @@ -16063,9 +16063,14 @@ "type" : "integer", "minimum" : 1 } + }, + "ui_display_type" : { + "default" : "cron/raw", + "type" : "string", + "enum" : [ "cron/raw", "cron/builder" ] } }, - "required" : [ "name", "schedule" ] + "required" : [ "name", "schedule", "ui_display_type" ] } } } @@ -16168,6 +16173,10 @@ "type" : "integer", "minimum" : 1 } + }, + "ui_display_type" : { + "type" : "string", + "enum" : [ "cron/raw", "cron/builder" ] } } } diff --git a/_site/docs/master/people-and-groups/user-provisioning.html b/_site/docs/master/people-and-groups/user-provisioning.html index 6e4eeb3339..fb159eb3b0 100644 --- a/_site/docs/master/people-and-groups/user-provisioning.html +++ b/_site/docs/master/people-and-groups/user-provisioning.html @@ -4949,7 +4949,7 @@

User provisioning via SCIM

To set up user provisioning with SCIM, hit the toggle to enable it. Metabase will tell you the SCIM endpoint URL and SCIM token to share with your identity provider.

-

If you’ve previously set up user provisioning with SAML, Metabase will turn that setting off and use the SCIM setup instead.

+

SAML user provisioning is always disabled when SCIM is enabled.

SCIM endpoint URL