diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-07 21:18:24 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-07 21:18:24 +0300 |
| commit | 73cd2cee8173e3665b3bf9c857d3014663e6dc05 (patch) | |
| tree | 36238814e37eca262aa1636561e64ca5e2c8d463 /doc | |
| parent | b8a587b909d09eabfa95c4237463738a98fdd034 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/administration/dedicated/index.md | 11 | ||||
| -rw-r--r-- | doc/ci/yaml/inputs.md | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/doc/administration/dedicated/index.md b/doc/administration/dedicated/index.md index c43169250f0..c69162a254f 100644 --- a/doc/administration/dedicated/index.md +++ b/doc/administration/dedicated/index.md @@ -14,7 +14,7 @@ The instructions on this page guide you through: 1. Onboarding and initial setup of your GitLab Dedicated instance using [Switchboard](https://about.gitlab.com/direction/saas-platforms/switchboard/), the GitLab Dedicated portal. 1. Configuring your GitLab Dedicated instance including enabling and updating the settings for [available functionality](../../subscriptions/gitlab_dedicated/index.md#available-features). -Any functionality in the GitLab application that is not controlled by the SaaS environment can be configured by using the [Admin Panel](../../administration/admin_area.md). +Any functionality in the GitLab application that is not controlled by the SaaS environment can be configured by using the [Admin Area](../../administration/admin_area.md). Examples of SaaS environment settings include `gitlab.rb` configurations and access to shell, Rails console, and PostgreSQL console. These environment settings cannot be changed by tenants. @@ -83,10 +83,11 @@ In an event of a platform outage, degradation or a security event requiring urge emergency maintenance will be carried out per [the emergency change processes](https://about.gitlab.com/handbook/engineering/infrastructure/emergency-change-processes/). -The emergency maintenance is initiated urgently when urgent actions need to be executed by GitLab -on a Dedicated tenant instance. -Communication with the customer will be provided on best effort basis prior to commencing the -maintenance, and full communication will follow after the immediate action is carried out. +The emergency maintenance is initiated when urgent actions need to be executed by GitLab on a +Dedicated tenant instance. Communication with the customer will be provided on best effort basis +prior to commencing the maintenance, and full communication will follow after the immediate action +is carried out. The GitLab Support Team will create a new ticket and send a message to the email +addresses of the users listed in Switchboard during [onboarding](#onboarding-to-gitlab-dedicated-using-switchboard). For example, when a critical security process is initiated to address an S1 vulnerability in GitLab, emergency maintenance is carried out to upgrade GitLab to the non-vulnerable version and that diff --git a/doc/ci/yaml/inputs.md b/doc/ci/yaml/inputs.md index 0869be6da9f..3f1ab3a5091 100644 --- a/doc/ci/yaml/inputs.md +++ b/doc/ci/yaml/inputs.md @@ -89,7 +89,7 @@ spec: default: true --- -"$[[ job-prefix ]]-scan-website": +"$[[ inputs.job-prefix ]]-scan-website": stage: $[[ inputs.job-stage ]] script: - echo "scanning website -e $[[ inputs.environment ]] -c $[[ inputs.concurrency ]] -v $[[ inputs.version ]]" |