Add latest changes from gitlab-org/gitlab@master

5 files changed, 14 insertions, 4 deletions

diff --git a/Gemfile b/Gemfile
index 5780e43fc6a..e04a506a2cc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -174,7 +174,7 @@ gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentati
 gem 'elasticsearch-api',   '7.13.3'
 gem 'aws-sdk-core', '~> 3.174.0'
 gem 'aws-sdk-cloudformation', '~> 1'
-gem 'aws-sdk-s3', '~> 1.123.0'
+gem 'aws-sdk-s3', '~> 1.123.1'
 gem 'faraday_middleware-aws-sigv4', '~>0.3.0'
 gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections
 
diff --git a/Gemfile.checksum b/Gemfile.checksum
index 7776eff7487..fb11e5ca0d9 100644
--- a/Gemfile.checksum
+++ b/Gemfile.checksum
@@ -39,7 +39,7 @@
 {"name":"aws-sdk-cloudformation","version":"1.41.0","platform":"ruby","checksum":"31e47539719734413671edf9b1a31f8673fbf9688549f50c41affabbcb1c6b26"},
 {"name":"aws-sdk-core","version":"3.174.0","platform":"ruby","checksum":"b694c6b0ffd6e683d952a92fd005ef5446c8de79056e8cc727e26204eee149e4"},
 {"name":"aws-sdk-kms","version":"1.64.0","platform":"ruby","checksum":"40de596c95047bfc6e1aacea24f3df6241aa716b6f7ce08ac4c5f7e3120395ad"},
-{"name":"aws-sdk-s3","version":"1.123.0","platform":"ruby","checksum":"ee281b41753952fc1d0d4a6b35a6615e495870ced2e9e207b2aa470505e7e869"},
+{"name":"aws-sdk-s3","version":"1.123.1","platform":"ruby","checksum":"2a07d98dc6e0031ae636c082d600a546e362a8dea9d21e9dd841df92d0cb4e2d"},
 {"name":"aws-sigv4","version":"1.5.1","platform":"ruby","checksum":"d68c87fff4ee843b4b92b23c7f31f957f254ec6eb064181f7119124aab8b8bb4"},
 {"name":"axe-core-api","version":"4.6.0","platform":"ruby","checksum":"1b0ddec3353f108dc10363baf2282f43a5ff7f13d4e25f99071294e78f8a6c62"},
 {"name":"axe-core-rspec","version":"4.6.0","platform":"ruby","checksum":"11c25bc9dd388c137ba4e5e63d64d20092bf22c884d8ffc829a22acfbacd747f"},
diff --git a/Gemfile.lock b/Gemfile.lock
index 3ebb7134a43..c060d1739be 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -211,7 +211,7 @@ GEM
     aws-sdk-kms (1.64.0)
       aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.123.0)
+    aws-sdk-s3 (1.123.1)
       aws-sdk-core (~> 3, >= 3.174.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
@@ -1674,7 +1674,7 @@ DEPENDENCIES
   awesome_print
   aws-sdk-cloudformation (~> 1)
   aws-sdk-core (~> 3.174.0)
-  aws-sdk-s3 (~> 1.123.0)
+  aws-sdk-s3 (~> 1.123.1)
   axe-core-rspec
   babosa (~> 2.0)
   base32 (~> 0.3.0)
diff --git a/doc/ci/pipelines/downstream_pipelines.md b/doc/ci/pipelines/downstream_pipelines.md
index ffcfee98f05..9de1e225a81 100644
--- a/doc/ci/pipelines/downstream_pipelines.md
+++ b/doc/ci/pipelines/downstream_pipelines.md
@@ -661,6 +661,12 @@ For example, in a [multi-project pipeline](#multi-project-pipelines):
          artifacts: true
    ```
 
+### Control what type of variables to forward to downstream pipelines
+
+Use the [`trigger:forward` keyword](../yaml/index.md#triggerforward) to specify
+what type of variables to forward to the downstream pipeline. Forwarded variables
+are considered trigger variables, which have the [highest precedence](../variables/index.md#cicd-variable-precedence).
+
 ## Troubleshooting
 
 ### Trigger job fails and does not create multi-project pipeline
diff --git a/doc/ci/variables/index.md b/doc/ci/variables/index.md
index 64a0f1038ad..1e50756d08f 100644
--- a/doc/ci/variables/index.md
+++ b/doc/ci/variables/index.md
@@ -718,6 +718,10 @@ use this setting for control over the environment the pipeline runs in.
   The example can be copied to your own group or instance for testing. More details
   on what other GitLab CI patterns are demonstrated are available at the project page.
 
+- You can [pass CI/CD variables to downstream pipelines](../pipelines/downstream_pipelines.md#pass-cicd-variables-to-a-downstream-pipeline).
+  Use [`trigger:forward` keyword](../yaml/index.md#triggerforward) to specify what type of variables
+  to pass to the downstream pipeline.
+
 ## Troubleshooting
 
 ### List all variables