Skip to content

Commit c449fca

Browse files
github-automation-metabaseMetabase Docs bot
andauthored
[auto] adding content to docs-scim-saml->master (#654)
Co-authored-by: Metabase Docs bot <[email protected]>
1 parent ff6ad34 commit c449fca

File tree

4 files changed

+22
-4
lines changed

4 files changed

+22
-4
lines changed

_docs/master/api.html

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15980,9 +15980,14 @@
1598015980
"type" : "integer",
1598115981
"minimum" : 1
1598215982
}
15983+
},
15984+
"ui_display_type" : {
15985+
"default" : "cron/raw",
15986+
"type" : "string",
15987+
"enum" : [ "cron/raw", "cron/builder" ]
1598315988
}
1598415989
},
15985-
"required" : [ "name", "schedule" ]
15990+
"required" : [ "name", "schedule", "ui_display_type" ]
1598615991
}
1598715992
}
1598815993
}
@@ -16085,6 +16090,10 @@
1608516090
"type" : "integer",
1608616091
"minimum" : 1
1608716092
}
16093+
},
16094+
"ui_display_type" : {
16095+
"type" : "string",
16096+
"enum" : [ "cron/raw", "cron/builder" ]
1608816097
}
1608916098
}
1609016099
}

_docs/master/people-and-groups/user-provisioning.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Click on the **User provisioning** tab.
3232

3333
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.
3434

35-
> If you've previously set up user provisioning with SAML, Metabase will turn that setting off and use the SCIM setup instead.
35+
> SAML user provisioning is always disabled when SCIM is enabled.
3636
3737
## SCIM endpoint URL
3838

_site/docs/master/api.html

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16063,9 +16063,14 @@
1606316063
"type" : "integer",
1606416064
"minimum" : 1
1606516065
}
16066+
},
16067+
"ui_display_type" : {
16068+
"default" : "cron/raw",
16069+
"type" : "string",
16070+
"enum" : [ "cron/raw", "cron/builder" ]
1606616071
}
1606716072
},
16068-
"required" : [ "name", "schedule" ]
16073+
"required" : [ "name", "schedule", "ui_display_type" ]
1606916074
}
1607016075
}
1607116076
}
@@ -16168,6 +16173,10 @@
1616816173
"type" : "integer",
1616916174
"minimum" : 1
1617016175
}
16176+
},
16177+
"ui_display_type" : {
16178+
"type" : "string",
16179+
"enum" : [ "cron/raw", "cron/builder" ]
1617116180
}
1617216181
}
1617316182
}

_site/docs/master/people-and-groups/user-provisioning.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4949,7 +4949,7 @@ <h2 id="user-provisioning-via-scim">User provisioning via SCIM</h2>
49494949
<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>
49504950

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

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

0 commit comments

Comments
 (0)