Fix merge conflicts

Browse Source

...

This commit is contained in:

Tuan Dang

2024-03-15 13:07:29 -07:00

parent 6b92a5f4db 2d3fddd0e9

commit f77942c702

523 changed files with 22146 additions and 7191 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/docker-swarm-secrets-complete.png

BIN

Binary file not shown.

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

docs/images/integrations/heroku/integrations-heroku-create.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 179 KiB After Width:  |  Height:  |  Size: 533 KiB

docs/images/integrations/heroku/integrations-heroku.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 371 KiB After Width:  |  Height:  |  Size: 700 KiB

docs/images/platform/ldap/jumpcloud/ldap-jumpcloud-enable-bind-dn.png

BIN

Binary file not shown.

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

docs/images/platform/ldap/jumpcloud/ldap-jumpcloud-org-dn.png

BIN

Binary file not shown.

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

docs/images/platform/ldap/ldap-config.png

BIN

Binary file not shown.

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

docs/images/platform/ldap/ldap-toggle.png

BIN

Binary file not shown.

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

docs/images/platform/scim/azure/scim-azure-config.png

BIN

Binary file not shown.

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

docs/images/platform/scim/azure/scim-azure-get-started.png

BIN

Binary file not shown.

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

docs/images/platform/scim/azure/scim-azure-provisioning-status.png

BIN

Binary file not shown.

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

docs/images/platform/scim/azure/scim-azure-select-user-mappings.png

BIN

Binary file not shown.

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

docs/images/platform/scim/azure/scim-azure-start-provisioning.png

BIN

Binary file not shown.

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

docs/images/platform/scim/azure/scim-azure-user-mappings.png

BIN

Binary file not shown.

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

docs/images/platform/scim/jumpcloud/scim-jumpcloud-api-type.png

BIN

Binary file not shown.

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

docs/images/platform/scim/jumpcloud/scim-jumpcloud-config.png

BIN

Binary file not shown.

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

docs/images/platform/scim/jumpcloud/scim-jumpcloud-test-connection.png

BIN

Binary file not shown.

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

docs/images/platform/scim/okta/scim-okta-app-settings.png

BIN

Binary file not shown.

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

docs/images/platform/scim/okta/scim-okta-auth.png

BIN

Binary file not shown.

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

docs/images/platform/scim/okta/scim-okta-config.png

BIN

Binary file not shown.

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

docs/images/platform/scim/okta/scim-okta-enable-provisioning.png

BIN

Binary file not shown.

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

docs/images/platform/scim/okta/scim-okta-test.png

BIN

Binary file not shown.

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

docs/images/platform/scim/scim-copy-token.png

BIN

Binary file not shown.

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

docs/images/platform/scim/scim-create-token.png

BIN

Binary file not shown.

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

docs/images/platform/scim/scim-enable-provisioning.png

BIN

Binary file not shown.

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

docs/images/platform/secret-rotation/aws-iam/rotation-config-1.png

BIN

Binary file not shown.

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

docs/images/platform/secret-rotation/aws-iam/rotation-config-2.png

BIN

Binary file not shown.

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

docs/images/platform/secret-rotation/aws-iam/rotation-config-secrets.png

BIN

Binary file not shown.

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

docs/images/platform/secret-rotation/aws-iam/rotation-manager-access-key-third-party.png

BIN

Binary file not shown.

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

docs/images/platform/secret-rotation/aws-iam/rotation-manager-access-keys.png

BIN

Binary file not shown.

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

docs/images/platform/secret-rotation/aws-iam/rotation-manager-attach-policy.png

BIN

Binary file not shown.

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

docs/images/platform/secret-rotation/aws-iam/rotation-manager-create-access-key.png

BIN

Binary file not shown.

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

docs/images/platform/secret-rotation/aws-iam/rotation-manager-create-policy.png

BIN

Binary file not shown.

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

docs/images/platform/secret-rotation/aws-iam/rotation-manager-create-user.png

BIN

Binary file not shown.

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

docs/images/platform/secret-rotation/aws-iam/rotation-manager-policy-review.png

BIN

Binary file not shown.

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

docs/images/platform/secret-rotation/aws-iam/rotation-manager-user-review.png

BIN

Binary file not shown.

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

docs/images/platform/secret-rotation/aws-iam/rotation-manager-username.png

BIN

Binary file not shown.

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

docs/images/platform/secret-rotation/aws-iam/rotations-aws-iam-user.png

BIN

Binary file not shown.

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

docs/images/platform/secret-rotation/aws-iam/rotations-select-aws-iam-user.png

BIN

Binary file not shown.

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

docs/images/self-hosting/applicable-to-all/selfhost-signup.png

BIN

Binary file not shown.

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

docs/images/self-hosting/guides/mongo-postgres/mongo-migration.png

BIN

Binary file not shown.

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

docs/images/sso/google-saml/attribute-mapping.png

BIN

Binary file not shown.

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

docs/images/sso/google-saml/create-custom-saml-app.png

BIN

Binary file not shown.

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

docs/images/sso/google-saml/custom-saml-app-config-2.png

BIN

Binary file not shown.

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

docs/images/sso/google-saml/custom-saml-app-config.png

BIN

Binary file not shown.

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

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

BIN

Binary file not shown.

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

docs/images/sso/google-saml/infisical-config.png

BIN

Binary file not shown.

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

docs/images/sso/google-saml/init-config.png

BIN

Binary file not shown.

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

docs/images/sso/google-saml/name-custom-saml-app.png

BIN

Binary file not shown.

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

docs/images/sso/google-saml/user-access-assign.png

BIN

Binary file not shown.

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

docs/images/sso/google-saml/user-access.png

BIN

Binary file not shown.

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