Fix merge conflicts

This commit is contained in:
Tuan Dang
2025-05-02 13:06:18 -07:00
233 changed files with 8799 additions and 1213 deletions

View File

@@ -228,7 +228,8 @@
{
"group": "Workflow Integrations",
"pages": [
"documentation/platform/workflow-integrations/slack-integration"
"documentation/platform/workflow-integrations/slack-integration",
"documentation/platform/workflow-integrations/microsoft-teams-integration"
]
},
{
@@ -443,6 +444,7 @@
"integrations/app-connections/databricks",
"integrations/app-connections/gcp",
"integrations/app-connections/github",
"integrations/app-connections/hashicorp-vault",
"integrations/app-connections/humanitec",
"integrations/app-connections/ldap",
"integrations/app-connections/mssql",
@@ -470,6 +472,7 @@
"integrations/secret-syncs/databricks",
"integrations/secret-syncs/gcp-secret-manager",
"integrations/secret-syncs/github",
"integrations/secret-syncs/hashicorp-vault",
"integrations/secret-syncs/humanitec",
"integrations/secret-syncs/teamcity",
"integrations/secret-syncs/terraform-cloud",
@@ -1073,6 +1076,18 @@
"api-reference/endpoints/app-connections/github/delete"
]
},
{
"group": "Hashicorp Vault",
"pages": [
"api-reference/endpoints/app-connections/hashicorp-vault/list",
"api-reference/endpoints/app-connections/hashicorp-vault/available",
"api-reference/endpoints/app-connections/hashicorp-vault/get-by-id",
"api-reference/endpoints/app-connections/hashicorp-vault/get-by-name",
"api-reference/endpoints/app-connections/hashicorp-vault/create",
"api-reference/endpoints/app-connections/hashicorp-vault/update",
"api-reference/endpoints/app-connections/hashicorp-vault/delete"
]
},
{
"group": "Humanitec",
"pages": [
@@ -1285,6 +1300,20 @@
"api-reference/endpoints/secret-syncs/github/remove-secrets"
]
},
{
"group": "Hashicorp Vault",
"pages": [
"api-reference/endpoints/secret-syncs/hashicorp-vault/list",
"api-reference/endpoints/secret-syncs/hashicorp-vault/get-by-id",
"api-reference/endpoints/secret-syncs/hashicorp-vault/get-by-name",
"api-reference/endpoints/secret-syncs/hashicorp-vault/create",
"api-reference/endpoints/secret-syncs/hashicorp-vault/update",
"api-reference/endpoints/secret-syncs/hashicorp-vault/delete",
"api-reference/endpoints/secret-syncs/hashicorp-vault/sync-secrets",
"api-reference/endpoints/secret-syncs/hashicorp-vault/import-secrets",
"api-reference/endpoints/secret-syncs/hashicorp-vault/remove-secrets"
]
},
{
"group": "Humanitec",
"pages": [
@@ -1554,6 +1583,7 @@
},
"internals/components",
"internals/security",
"internals/bug-bounty",
"internals/service-tokens"
]
},