Address merge conflicts

Browse Source

...

This commit is contained in:

Tuan Dang

2024-04-04 10:01:19 -07:00

parent e1d9f779b2 b5af5646ee

commit 51819e57d1

227 changed files with 6225 additions and 1804 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

docs/images/auth-methods/access-personal-settings.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 135 KiB

docs/images/integrations/aws/integrations-aws-secret-manager-auth.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 180 KiB After Width:  |  Height:  |  Size: 124 KiB

docs/images/integrations/aws/integrations-aws-secret-manager-create.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 204 KiB After Width:  |  Height:  |  Size: 584 KiB

docs/images/organization-members.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.3 MiB

docs/images/platform/access-controls/add-additional-privileges.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 40 KiB

docs/images/platform/access-controls/additional-privileges.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 226 KiB

docs/images/platform/access-controls/configure-temporary-access.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 88 KiB

docs/images/platform/access-controls/confirm-additional-privileges.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 64 KiB

docs/images/platform/access-controls/edit-role.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 63 KiB

docs/images/platform/access-controls/rbac.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 200 KiB

docs/images/platform/access-controls/temporary-access.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 236 KiB

docs/images/platform/organization/organization-machine-identities.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 148 KiB

docs/images/platform/organization/organization-members-roles.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.1 MiB After Width:  |  Height:  |  Size: 116 KiB

docs/images/platform/organization/organization-members.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 162 KiB

docs/images/platform/organization/organization-settings-auth.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.2 MiB After Width:  |  Height:  |  Size: 519 KiB

docs/images/platform/project/project-environments.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 114 KiB

docs/images/platform/secret-versioning.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 292 KiB

docs/images/sso/keycloak/client-mappers-by-configuration.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 279 KiB

docs/images/sso/keycloak/client-mappers-completed.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 312 KiB

docs/images/sso/keycloak/client-mappers-email.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 259 KiB

docs/images/sso/keycloak/client-mappers-empty.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 250 KiB

docs/images/sso/keycloak/client-mappers-id.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 260 KiB

docs/images/sso/keycloak/client-mappers-predefined.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 334 KiB

docs/images/sso/keycloak/client-mappers-user-property.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 416 KiB

docs/images/sso/keycloak/client-mappers-username.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 269 KiB

docs/images/sso/keycloak/client-saml-capabilities.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 306 KiB

docs/images/sso/keycloak/client-scopes-list.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 291 KiB

docs/images/sso/keycloak/client-signature-encryption.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 303 KiB

docs/images/sso/keycloak/clients-list.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 295 KiB

docs/images/sso/keycloak/create-client-general-settings.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 253 KiB

docs/images/sso/keycloak/create-client-login-settings.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 313 KiB

docs/images/sso/keycloak/enable-saml.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 568 KiB

docs/images/sso/keycloak/idp-values.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 521 KiB

docs/images/sso/keycloak/init-config.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 453 KiB

docs/images/sso/keycloak/org-security-section.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 680 KiB

docs/images/sso/keycloak/realm-saml-metadata.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 271 KiB

docs/images/sso/keycloak/realm-settings-keys.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 306 KiB