Add latest changes from gitlab-org/gitlab@master

7 files changed, 52 insertions, 17 deletions

diff --git a/doc/administration/gitaly/index.md b/doc/administration/gitaly/index.md
index e8ac020ce78..c5c24e4a91a 100644
--- a/doc/administration/gitaly/index.md
+++ b/doc/administration/gitaly/index.md
@@ -66,6 +66,10 @@ Gitaly comes pre-configured with Omnibus GitLab, which is a configuration
 
 GitLab installations for more than 2000 users should use Gitaly Cluster.
 
+NOTE:
+If not set in GitLab, feature flags are read as false from the console and Gitaly uses their
+default value. The default value depends on the GitLab version.
+
 ## Gitaly Cluster
 
 Gitaly, the service that provides storage for Git repositories, can
diff --git a/doc/administration/gitaly/praefect.md b/doc/administration/gitaly/praefect.md
index cc876e33ed9..49172917c72 100644
--- a/doc/administration/gitaly/praefect.md
+++ b/doc/administration/gitaly/praefect.md
@@ -24,6 +24,10 @@ See the [design
 document](https://gitlab.com/gitlab-org/gitaly/-/blob/master/doc/design_ha.md)
 for implementation details.
 
+NOTE:
+If not set in GitLab, feature flags are read as false from the console and Praefect uses their
+default value. The default value depends on the GitLab version.
+
 ## Setup Instructions
 
 If you [installed](https://about.gitlab.com/install/) GitLab using the Omnibus
@@ -978,9 +982,6 @@ Feature.enable(:gitaly_reference_transactions)
 Feature.disable(:gitaly_reference_transactions_primary_wins)
 ```
 
-NOTE:
-If not set in GitLab, flags are read as false from the console and Praefect uses their default value, which depends on the GitLab version.
-
 To monitor strong consistency, you can use the following Prometheus metrics:
 
 - `gitaly_praefect_transactions_total`: Number of transactions created and
@@ -1248,8 +1249,9 @@ affected repositories. Praefect provides tools for:
 - [Automatic](#automatic-reconciliation) reconciliation, for GitLab 13.4 and later.
 - [Manual](#manual-reconciliation) reconciliation, for:
   - GitLab 13.3 and earlier.
-  - Repositories upgraded to GitLab 13.4 and later without entries in the `repositories` table.
-    A migration tool [is planned](https://gitlab.com/gitlab-org/gitaly/-/issues/3033).
+  - Repositories upgraded to GitLab 13.4 and later without entries in the `repositories` table. In
+    GitLab 13.6 and later, [a migration is run](https://gitlab.com/gitlab-org/gitaly/-/issues/3033)
+    when Praefect starts for these repositories.
 
 These tools reconcile the outdated repositories to bring them fully up to date again.
 
diff --git a/doc/api/runners.md b/doc/api/runners.md
index 1782e236c36..c96ff1b0360 100644
--- a/doc/api/runners.md
+++ b/doc/api/runners.md
@@ -156,6 +156,10 @@ Example response:
 
 Get details of a runner.
 
+[Maintainer access or higher](../user/permissions.md) is required to get runner details at the project and group level. 
+
+Instance-level runner details via this endpoint are available to all signed in users.
+
 ```plaintext
 GET /runners/:id
 ```
diff --git a/doc/ci/variables/predefined_variables.md b/doc/ci/variables/predefined_variables.md
index 2cf2373acf9..26a53903f29 100644
--- a/doc/ci/variables/predefined_variables.md
+++ b/doc/ci/variables/predefined_variables.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: reference
 ---
 
-# Predefined variables reference
+# Predefined variables reference **(FREE)**
 
 Predefined [CI/CD variables](README.md) are available in every GitLab CI/CD pipeline.
 
diff --git a/doc/development/gitaly.md b/doc/development/gitaly.md
index 87b9d35f99b..2e814a9c41b 100644
--- a/doc/development/gitaly.md
+++ b/doc/development/gitaly.md
@@ -303,16 +303,19 @@ Here are the steps to gate a new feature in Gitaly behind a feature flag.
 
 ### GitLab Rails
 
-1. Test in a Rails console by setting the feature flag:
+Test in a Rails console by setting the feature flag:
 
-   NOTE:
-   Pay attention to the name of the flag and the one used in the Rails console.
-   There is a difference between them (dashes replaced by underscores and name
-   prefix is changed). Make sure to prefix all flags with `gitaly_`.
+```ruby
+Feature.enable('gitaly_go_find_all_tags')
+```
 
-   ```ruby
-   Feature.enable('gitaly_go_find_all_tags')
-   ```
+Pay attention to the name of the flag and the one used in the Rails console. There is a difference
+between them (dashes replaced by underscores and name prefix is changed). Make sure to prefix all
+flags with `gitaly_`.
+
+NOTE:
+If not set in GitLab, feature flags are read as false from the console and Gitaly uses their
+default value. The default value depends on the GitLab version.
 
 ### Testing with GDK
 
diff --git a/doc/user/application_security/dast/index.md b/doc/user/application_security/dast/index.md
index d646de50435..70f3a586825 100644
--- a/doc/user/application_security/dast/index.md
+++ b/doc/user/application_security/dast/index.md
@@ -588,7 +588,7 @@ include:
   - template: DAST.gitlab-ci.yml
 
 variables:
-  DAST_PATHS=/page1.html,/category1/page1.html,/page3.html
+  DAST_PATHS: "/page1.html,/category1/page1.html,/page3.html"
 ```
 
 When using `DAST_PATHS` and `DAST_PATHS_FILE`, note the following:
diff --git a/doc/user/project/issue_board.md b/doc/user/project/issue_board.md
index e21ab54267c..1bf2e2b7a6e 100644
--- a/doc/user/project/issue_board.md
+++ b/doc/user/project/issue_board.md
@@ -343,10 +343,10 @@ As in other list types, click the trash icon to remove a list.
 ### Iteration lists **(PREMIUM)**
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/250479) in GitLab 13.10.
-> - It's [deployed behind the `board_new_lists` feature flag](../feature_flags.md), disabled by default.
+> - It's [deployed behind the `board_new_lists` and `iteration_board_lists` feature flags](../feature_flags.md), disabled by default.
 > - It's disabled on GitLab.com.
 > - It's recommended for production use.
-> - To use it in GitLab self-managed instances, ask a GitLab administrator to [enable it](#enable-or-disable-new-add-list-form).
+> - To use it in GitLab self-managed instances, ask a GitLab administrator to enable the feature flags: [`board_new_lists`](#enable-or-disable-new-add-list-form) and [`iteration_board_lists`](#enable-or-disable-iteration-lists-in-boards).
 
 WARNING:
 This feature might not be available to you. Check the **version history** note above for details.
@@ -662,3 +662,25 @@ To disable it:
 ```ruby
 Feature.disable(:board_new_list)
 ```
+
+### Enable or disable iteration lists in boards **(PREMIUM SELF)**
+
+NOTE:
+To enable iteration lists in boards, you also need to enable the [new add list form](#enable-or-disable-new-add-list-form).
+
+The iteration list is under development and not ready for production use. It is
+deployed behind a feature flag that is **disabled by default**.
+[GitLab administrators with access to the GitLab Rails console](../../administration/feature_flags.md)
+can enable it.
+
+To enable it:
+
+```ruby
+Feature.enable(:iteration_board_lists)
+```
+
+To disable it:
+
+```ruby
+Feature.disable(:iteration_board_lists)
+```