diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-29 06:09:08 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-29 06:09:08 +0300 |
| commit | ced01fb79233c18bc05748804ede24591c04cf49 (patch) | |
| tree | 1bf4c3031f5f5890052cbe016708692094fbf22b | |
| parent | 844c7cae5c093eddcef02b07132d8131aa5414b8 (diff) | |
Add latest changes from gitlab-org/gitlab@master
| -rw-r--r-- | db/docs/integrations.yml | 1 | ||||
| -rw-r--r-- | db/docs/organizations.yml | 4 | ||||
| -rw-r--r-- | doc/development/ai_features.md | 3 | ||||
| -rw-r--r-- | doc/user/application_security/iac_scanning/index.md | 3 |
4 files changed, 8 insertions, 3 deletions
diff --git a/db/docs/integrations.yml b/db/docs/integrations.yml index 91675f8de35..889a57a550d 100644 --- a/db/docs/integrations.yml +++ b/db/docs/integrations.yml @@ -16,6 +16,7 @@ classes: - Integrations::Bugzilla - Integrations::Buildkite - Integrations::Campfire +- Integrations::Clickup - Integrations::Confluence - Integrations::CustomIssueTracker - Integrations::Datadog diff --git a/db/docs/organizations.yml b/db/docs/organizations.yml index 68278d0e6e4..ebc7e8b68d1 100644 --- a/db/docs/organizations.yml +++ b/db/docs/organizations.yml @@ -1,10 +1,10 @@ --- table_name: organizations classes: -- Organization +- Organizations::Organization feature_categories: - cell description: Define ownership of namespaces, projects, and users by organizations introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119421 -milestone: "16.0" +milestone: '16.0' gitlab_schema: gitlab_main diff --git a/doc/development/ai_features.md b/doc/development/ai_features.md index c1493e3f843..a19468f4c61 100644 --- a/doc/development/ai_features.md +++ b/doc/development/ai_features.md @@ -107,7 +107,8 @@ In order to obtain a GCP service key for local development, please follow the st - Create a sandbox GCP environment by visiting [this page](https://about.gitlab.com/handbook/infrastructure-standards/#individual-environment) and following the instructions, or by requesting access to our existing group environment by using [this template](https://gitlab.com/gitlab-com/it/infra/issue-tracker/-/issues/new?issuable_template=gcp_group_account_iam_update_request). At this time, access to any endpoints outside of `text-bison` or `chat-bison` must be made through the group environment. - In the GCP console, go to `IAM & Admin` > `Service Accounts` and click on the "Create new service account" button - Name the service account something specific to what you're using it for. Select Create and Continue. Under `Grant this service account access to project`, select the role `Vertex AI User`. Select `Continue` then `Done` -- Select your new service account and `Manage keys` > `Add Key` > `Create new key`. This will download the **private** JSON credentials for your service account. Your full settings should then be: +- Select your new service account and `Manage keys` > `Add Key` > `Create new key`. This will download the **private** JSON credentials for your service account. +- Open the Rails console. Update the settings to: ```ruby Gitlab::CurrentSettings.update(tofa_credentials: File.read('/YOUR_FILE.json')) diff --git a/doc/user/application_security/iac_scanning/index.md b/doc/user/application_security/iac_scanning/index.md index 48b2b8c1f1a..ae23b0b0f78 100644 --- a/doc/user/application_security/iac_scanning/index.md +++ b/doc/user/application_security/iac_scanning/index.md @@ -116,6 +116,9 @@ that you can download and analyze. ### Enable IaC Scanning via an automatic merge request +NOTE: +The **Configure with a merge request** button been temporarily disabled due to a known issue. For details, see [merge request 83757](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83757). + To enable IaC Scanning in a project, you can create a merge request: 1. On the top bar, select **Main menu > Projects** and find your project. |