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
11 changes: 10 additions & 1 deletion _docs/master/api.html
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
}
}
}
Expand Down Expand Up @@ -16085,6 +16090,10 @@
"type" : "integer",
"minimum" : 1
}
},
"ui_display_type" : {
"type" : "string",
"enum" : [ "cron/raw", "cron/builder" ]
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion _docs/master/people-and-groups/user-provisioning.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
11 changes: 10 additions & 1 deletion _site/docs/master/api.html
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
}
}
}
Expand Down Expand Up @@ -16168,6 +16173,10 @@
"type" : "integer",
"minimum" : 1
}
},
"ui_display_type" : {
"type" : "string",
"enum" : [ "cron/raw", "cron/builder" ]
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion _site/docs/master/people-and-groups/user-provisioning.html
Original file line number Diff line number Diff line change
Expand Up @@ -4949,7 +4949,7 @@ <h2 id="user-provisioning-via-scim">User provisioning via SCIM</h2>
<p>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.</p>

<blockquote>
<p>If you’ve previously set up user provisioning with SAML, Metabase will turn that setting off and use the SCIM setup instead.</p>
<p>SAML user provisioning is always disabled when SCIM is enabled.</p>
</blockquote>

<h2 id="scim-endpoint-url">SCIM endpoint URL</h2>
Expand Down