Add latest changes from gitlab-org/gitlab@master

config/initializers/active_record_database_tasks.rb

@@ -3,5 +3,5 @@
 return unless Gitlab.ee?
 
 ActiveSupport.on_load(:active_record) do
-  ActiveRecord::Tasks::DatabaseTasks.singleton_class.prepend(Gitlab::Patch::GeoDatabaseTasks)
+  Gitlab::Patch::GeoDatabaseTasks.patch!
 end

doc/ci/yaml/index.md

@@ -3842,18 +3842,18 @@ variables:
 Use `when` to configure the conditions for when jobs run. If not defined in a job,
 the default value is `when: on_success`.
 
-**Keyword type**: Job keyword. You can use it only as part of a job.
+**Keyword type**: Job keyword. You can use it as part of a job. `when: always` and `when: never` can also be used in [`workflow:rules`](#workflow).
 
 **Possible inputs**:
 
 - `on_success` (default): Run the job only when all jobs in earlier stages succeed
   or have `allow_failure: true`.
 - `manual`: Run the job only when [triggered manually](../jobs/job_control.md#create-a-job-that-must-be-run-manually).
-- `always`: Run the job regardless of the status of jobs in earlier stages.
+- `always`: Run the job regardless of the status of jobs in earlier stages. Can also be used in `workflow:rules`.
 - `on_failure`: Run the job only when at least one job in an earlier stage fails.
 - `delayed`: [Delay the execution of a job](../jobs/job_control.md#run-a-job-after-a-delay)
   for a specified duration.
-- `never`: Don't run the job.
+- `never`: Don't run the job. Can only be used in a [`rules`](#rules) section or `workflow: rules`.
 
 **Example of `when`**:
 

doc/development/fe_guide/vue.md

@@ -583,7 +583,7 @@ This is the template for the example component which is tested in the
           data-testid="text-input"
         >
         <gl-button
-          variant="success"
+          variant="confirm"
           data-testid="add-button"
           @click="addTodo"
         >Add</gl-button>

doc/update/index.md

@@ -517,7 +517,8 @@ that may remain stuck permanently in a **pending** state.
   sudo printf "x /tmp/gitaly-%s-*\n" hooks git-exec-path >/etc/tmpfiles.d/gitaly-workaround.conf
   ```
 
-  This issue is fixed in GitLab 14.10 and later.
+  This issue is fixed in GitLab 14.10 and later when using the [Gitaly runtime directory](https://docs.gitlab.com/omnibus/update/gitlab_14_changes.html#gitaly-runtime-directory)
+  to specify a location to store persistent files.
 
 ### 14.6.0