Automatic merge of gitlab-org/gitlab master

doc/administration/index.md

@@ -166,7 +166,7 @@ Learn how to install, configure, update, and maintain your GitLab instance.
 
 ## Continuous Integration settings
 
-- [Enable/disable GitLab CI/CD](../ci/enable_or_disable_ci.md#site-wide-admin-setting): Enable or disable GitLab CI/CD for your instance.
+- [Enable/disable GitLab CI/CD](../ci/enable_or_disable_ci.md#make-gitlab-cicd-disabled-by-default-in-new-projects): Enable or disable GitLab CI/CD for your instance.
 - [GitLab CI/CD administration settings](../user/admin_area/settings/continuous_integration.md): Enable or disable Auto DevOps site-wide and define the artifacts' max size and expiration time.
 - [External Pipeline Validation](external_pipeline_validation.md): Enable, disable, and configure external pipeline validation.
 - [Job artifacts](job_artifacts.md): Enable, disable, and configure job artifacts (a set of files and directories which are outputted by a job when it completes successfully).

doc/ci/enable_or_disable_ci.md

@@ -19,7 +19,7 @@ If you are using an external CI/CD server like Jenkins or Drone CI, it is advise
 to disable GitLab CI/CD in order to not have any conflicts with the commits status
 API.
 
-GitLab CI/CD is exposed via the `/pipelines` and `/jobs` pages of a project.
+GitLab CI/CD is exposed by using the `/pipelines` and `/jobs` pages of a project.
 Disabling GitLab CI/CD in a project does not delete any previous jobs.
 In fact, the `/pipelines` and `/jobs` pages can still be accessed, although
 it's hidden from the left sidebar menu.
@@ -36,62 +36,68 @@ pipelines that are run from an [external integration](../user/project/integratio
 
 ## Per-project user setting
 
-To enable or disable GitLab CI/CD Pipelines in your project:
+To enable or disable GitLab CI/CD pipelines in your project:
 
-1. Navigate to **Settings > General > Visibility, project features, permissions**.
-1. Expand the **Repository** section
-1. Enable or disable the **Pipelines** toggle as required.
+1. On the top bar, select **Menu > Projects** and find your project.
+1. On the left sidebar, select **Settings > General**.
+1. Expand **Visibility, project features, permissions**.
+1. In the **Repository** section, turn on or off **Pipelines** as required.
 
 **Project visibility** also affects pipeline visibility. If set to:
 
 - **Private**: Only project members can access pipelines.
 - **Internal** or **Public**: Pipelines can be set to either **Only Project Members**
-  or **Everyone With Access** via the dropdown box.
+  or **Everyone With Access** by using the dropdown box.
 
 Press **Save changes** for the settings to take effect.
 
-## Site-wide admin setting
+## Make GitLab CI/CD disabled by default in new projects
 
-You can disable GitLab CI/CD site-wide, by modifying the settings in `gitlab.yml`
-for source installations, and `gitlab.rb` for Omnibus installations.
+You can set GitLab CI/CD to be disabled by default in all new projects by modifying the settings in:
 
-Two things to note:
+- `gitlab.yml` for source installations.
+- `gitlab.rb` for Omnibus GitLab installations.
 
-- Disabling GitLab CI/CD affects only newly-created projects. Projects that
-  had it enabled prior to this modification work as before.
-- Even if you disable GitLab CI/CD, users can still enable it in the
-  project's settings.
+Existing projects that already had CI/CD enabled are unchanged. Also, this setting only changes
+the project default, so project owners can still enable CI/CD in the project settings.
 
-For installations from source, open `gitlab.yml` with your editor and set
-`builds` to `false`:
+For installations from source: 
 
-```yaml
-## Default project features settings
-default_projects_features:
-  issues: true
-  merge_requests: true
-  wiki: true
-  snippets: false
-  builds: false
-```
+1. Open `gitlab.yml` with your editor and set `builds` to `false`:
 
-Save the file and restart GitLab:
+   ```yaml
+   ## Default project features settings
+   default_projects_features:
+     issues: true
+     merge_requests: true
+     wiki: true
+     snippets: false
+     builds: false
+   ```
 
-```shell
-sudo service gitlab restart
-```
+1. Save the `gitlab.yml` file.
 
-For Omnibus installations, edit `/etc/gitlab/gitlab.rb` and add the line:
+1. Restart GitLab:
 
-```ruby
-gitlab_rails['gitlab_default_projects_features_builds'] = false
-```
+   ```shell
+   sudo service gitlab restart
+   ```
 
-Save the file and reconfigure GitLab:
+For Omnibus GitLab installations:
 
-```shell
-sudo gitlab-ctl reconfigure
-```
+1. Edit `/etc/gitlab/gitlab.rb` and add this line:
+
+   ```ruby
+   gitlab_rails['gitlab_default_projects_features_builds'] = false
+   ```
+
+1. Save the `/etc/gitlab/gitlab.rb` file.
+
+1. Reconfigure GitLab:
+
+   ```shell
+   sudo gitlab-ctl reconfigure
+   ```
 
 <!-- ## Troubleshooting
 

doc/ci/pipelines/index.md

@@ -53,7 +53,7 @@ Pipelines can be configured in many different ways:
 - [Multi-project pipelines](multi_project_pipelines.md) combine pipelines for different projects together.
 - [Parent-Child pipelines](parent_child_pipelines.md) break down complex pipelines
   into one parent pipeline that can trigger multiple child sub-pipelines, which all
-  run in the same project and with the same SHA.
+  run in the same project and with the same SHA. This pipeline architecture is commonly used for mono-repos.
 - [Pipelines for Merge Requests](../pipelines/merge_request_pipelines.md) run for merge
   requests only (rather than for every commit).
 - [Pipelines for Merged Results](../pipelines/pipelines_for_merged_results.md)

doc/ci/pipelines/merge_request_pipelines.md

@@ -16,8 +16,8 @@ changes are pushed to a branch.
 If you want the pipeline to run jobs **only** on commits associated with a merge request,
 you can use *pipelines for merge requests*.
 
-In the UI, these pipelines are labeled as `detached`. Otherwise, these pipelines are the same
-as other pipelines.
+These pipelines are labeled as `detached` in the UI, and they do not have access to [protected variables](../variables/index.md#protect-a-cicd-variable).
+Otherwise, these pipelines are the same as other pipelines.
 
 Pipelines for merge requests can run when you:
 

doc/ci/variables/index.md

@@ -317,6 +317,9 @@ You can protect a project, group or instance CI/CD variable so it is only passed
 to pipelines running on [protected branches](../../user/project/protected_branches.md)
 or [protected tags](../../user/project/protected_tags.md).
 
+[Pipelines for merge requests](../pipelines/merge_request_pipelines.md) do not have access to protected variables.
+An [issue exists](https://gitlab.com/gitlab-org/gitlab/-/issues/28002) regarding this limitation.
+
 To protect a variable:
 
 1. Go to **Settings > CI/CD** in the project, group or instance admin area.