From 894086d022d0e8ebf4b78ce6c097d55a018834c3 Mon Sep 17 00:00:00 2001 From: mirnawong1 <89008547+mirnawong1@users.noreply.github.com> Date: Thu, 12 Oct 2023 10:52:15 +0100 Subject: [PATCH 1/6] Update custom-branch-settings.md adding info about main branch being editable if custom branch is set --- .../Environments/custom-branch-settings.md | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/website/docs/faqs/Environments/custom-branch-settings.md b/website/docs/faqs/Environments/custom-branch-settings.md index 95929d2d393..110265b0087 100644 --- a/website/docs/faqs/Environments/custom-branch-settings.md +++ b/website/docs/faqs/Environments/custom-branch-settings.md @@ -1,5 +1,5 @@ --- -title: How do I use the `Custom Branch` settings in a dbt Cloud Environment? +title: How do I use the 'Custom Branch' settings in a dbt Cloud Environment? description: "Use custom code from your repository" sidebar_label: 'Custom Branch settings' id: custom-branch-settings @@ -15,12 +15,21 @@ To specify a custom branch: ## Development -In a development environment, the default branch (commonly the `main` branch) is a read-only branch found in the IDE's connected repositories, which you can use to create development branches. Identifying a custom branch overrides this default behavior. Instead, your custom branch becomes read-only and can be used to create development branches. You will no longer be able to make commits to the custom branch from within the dbt Cloud IDE. +In a development environment, the default branch (usually named `main`) is a read-only branch in your connected repositories, which allows you to create new branches for development based on it. -For example, you can use the `develop` branch of a connected repository. Edit an environment, select **Only run on a custom branch** in **General settings** , enter **develop** as the name of your custom branch. +Specifying a **Custom branch** overrides the default behavior. It makes the custom branch 'read-only' and enables you to create new development branches based on it. This also means you can't edit this custom branch directly. - +Only one branch can be read-only, which means when you set up a custom branch, your `main` branch (usually read-only) becomes editable. If you want to protect the `main` branch and prevent any commits on it, you need to set up branch protection rules in your git provider settings. This ensures your `main` branch remains secure and no new commits can be made to it. + +For example, if you want to use the `develop` branch of a connected repository: + +- Go to an environment and select **Settings** to edit it +- Select **Only run on a custom branch** in **General settings** +- Enter **develop** as the name of your custom branch +- Click **Save** + + ## Deployment -When running jobs in a deployment environment, dbt will clone your project from your connected repository before executing your models. By default, dbt uses the default branch of your repository (commonly the `main` branch). To specify a different version of your project for dbt to execute during job runs in a particular environment, you can edit the Custom Branch setting as shown in the previous steps. \ No newline at end of file +When running jobs in a deployment environment, dbt will clone your project from your connected repository before executing your models. By default, dbt uses the default branch of your repository (commonly the `main` branch). To specify a different version of your project for dbt to execute during job runs in a particular environment, you can edit the Custom Branch setting as shown in the previous steps. From 13483b987ca6398744fe45bd32d3d8af47de476b Mon Sep 17 00:00:00 2001 From: mirnawong1 Date: Tue, 24 Oct 2023 10:21:49 +0100 Subject: [PATCH 2/6] adding klipfolio --- .../avail-sl-integrations.md | 1 - website/snippets/_sl-partner-links.md | 14 ++++++++++++++ website/static/img/icons/Klipfolio-badge.svg | 9 +++++++++ website/static/img/icons/white/Klipfolio-badge.svg | 9 +++++++++ 4 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 website/static/img/icons/Klipfolio-badge.svg create mode 100644 website/static/img/icons/white/Klipfolio-badge.svg diff --git a/website/docs/docs/use-dbt-semantic-layer/avail-sl-integrations.md b/website/docs/docs/use-dbt-semantic-layer/avail-sl-integrations.md index a398ace164e..fb0136e29d8 100644 --- a/website/docs/docs/use-dbt-semantic-layer/avail-sl-integrations.md +++ b/website/docs/docs/use-dbt-semantic-layer/avail-sl-integrations.md @@ -25,7 +25,6 @@ import AvailIntegrations from '/snippets/_sl-partner-links.md'; You can also integrate the following tools with the dbt Semantic Layer: - [Push.ai](https://docs.push.ai/semantic-layer-integrations/dbt-semantic-layer) - [Delphi](delphihq.com) -- KlipFolio Power Metrics - Documentation coming soon ### Custom integration diff --git a/website/snippets/_sl-partner-links.md b/website/snippets/_sl-partner-links.md index 59e5b54b7c0..f8ad6477844 100644 --- a/website/snippets/_sl-partner-links.md +++ b/website/snippets/_sl-partner-links.md @@ -28,6 +28,20 @@ The following tools integrate with the dbt Semantic Layer: +
+ + + + +
+
+ + + + + klipfolio-badge + + + \ No newline at end of file diff --git a/website/static/img/icons/white/Klipfolio-badge.svg b/website/static/img/icons/white/Klipfolio-badge.svg new file mode 100644 index 00000000000..bdd583bd3a1 --- /dev/null +++ b/website/static/img/icons/white/Klipfolio-badge.svg @@ -0,0 +1,9 @@ + + + + + + klipfolio-badge + + + \ No newline at end of file From 44d358e2eb4c7185dcdce5df139bbda90029dce3 Mon Sep 17 00:00:00 2001 From: mirnawong1 Date: Tue, 24 Oct 2023 10:35:50 +0100 Subject: [PATCH 3/6] fix casing --- website/snippets/_sl-partner-links.md | 2 +- website/static/img/icons/{Klipfolio-badge.svg => klipfolio.svg} | 0 .../img/icons/white/{Klipfolio-badge.svg => klipfolio.svg} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename website/static/img/icons/{Klipfolio-badge.svg => klipfolio.svg} (100%) rename website/static/img/icons/white/{Klipfolio-badge.svg => klipfolio.svg} (100%) diff --git a/website/snippets/_sl-partner-links.md b/website/snippets/_sl-partner-links.md index f8ad6477844..ce2087bf380 100644 --- a/website/snippets/_sl-partner-links.md +++ b/website/snippets/_sl-partner-links.md @@ -33,7 +33,7 @@ The following tools integrate with the dbt Semantic Layer: title="KlipFolio Power Metrics" body="Refer to KlipFolio's documentation to learn how to connect, and deliver a streamlined metrics catalog to your business users." link="https://support.klipfolio.com/hc/en-us/articles/18164546900759-PowerMetrics-Adding-dbt-Semantic-Layer-metrics" - icon="klipfolio-badge"/> + icon="klipfolio"/> Date: Tue, 24 Oct 2023 10:38:23 +0100 Subject: [PATCH 4/6] Update website/docs/faqs/Environments/custom-branch-settings.md --- website/docs/faqs/Environments/custom-branch-settings.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/faqs/Environments/custom-branch-settings.md b/website/docs/faqs/Environments/custom-branch-settings.md index 110265b0087..0f9079881e3 100644 --- a/website/docs/faqs/Environments/custom-branch-settings.md +++ b/website/docs/faqs/Environments/custom-branch-settings.md @@ -1,7 +1,7 @@ --- title: How do I use the 'Custom Branch' settings in a dbt Cloud Environment? description: "Use custom code from your repository" -sidebar_label: 'Custom Branch settings' +sidebar_label: 'Custom branch settings' id: custom-branch-settings --- From ec4ac1885ba741c5baa8bdacbaea6d9342f6a503 Mon Sep 17 00:00:00 2001 From: mirnawong1 <89008547+mirnawong1@users.noreply.github.com> Date: Tue, 24 Oct 2023 16:18:05 +0100 Subject: [PATCH 5/6] Update website/docs/faqs/Environments/custom-branch-settings.md Co-authored-by: dave-connors-3 <73915542+dave-connors-3@users.noreply.github.com> --- website/docs/faqs/Environments/custom-branch-settings.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/faqs/Environments/custom-branch-settings.md b/website/docs/faqs/Environments/custom-branch-settings.md index 0f9079881e3..5d8bb862702 100644 --- a/website/docs/faqs/Environments/custom-branch-settings.md +++ b/website/docs/faqs/Environments/custom-branch-settings.md @@ -15,7 +15,7 @@ To specify a custom branch: ## Development -In a development environment, the default branch (usually named `main`) is a read-only branch in your connected repositories, which allows you to create new branches for development based on it. +In a development environment, the default branch (usually named `main`) is a read-only branch in your connected repositories, which allows you to create new branches for development from it. Specifying a **Custom branch** overrides the default behavior. It makes the custom branch 'read-only' and enables you to create new development branches based on it. This also means you can't edit this custom branch directly. From 9b0d6063fa4332ca38bee1391e5778f2f962b833 Mon Sep 17 00:00:00 2001 From: mirnawong1 <89008547+mirnawong1@users.noreply.github.com> Date: Tue, 24 Oct 2023 16:18:11 +0100 Subject: [PATCH 6/6] Update website/docs/faqs/Environments/custom-branch-settings.md Co-authored-by: dave-connors-3 <73915542+dave-connors-3@users.noreply.github.com> --- website/docs/faqs/Environments/custom-branch-settings.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/faqs/Environments/custom-branch-settings.md b/website/docs/faqs/Environments/custom-branch-settings.md index 5d8bb862702..4bc4b85be02 100644 --- a/website/docs/faqs/Environments/custom-branch-settings.md +++ b/website/docs/faqs/Environments/custom-branch-settings.md @@ -17,7 +17,7 @@ To specify a custom branch: In a development environment, the default branch (usually named `main`) is a read-only branch in your connected repositories, which allows you to create new branches for development from it. -Specifying a **Custom branch** overrides the default behavior. It makes the custom branch 'read-only' and enables you to create new development branches based on it. This also means you can't edit this custom branch directly. +Specifying a **Custom branch** overrides the default behavior. It makes the custom branch 'read-only' and enables you to create new development branches from it. This also means you can't edit this custom branch directly. Only one branch can be read-only, which means when you set up a custom branch, your `main` branch (usually read-only) becomes editable. If you want to protect the `main` branch and prevent any commits on it, you need to set up branch protection rules in your git provider settings. This ensures your `main` branch remains secure and no new commits can be made to it.