diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index e1700b44903..2cced985770 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -ceafa16c0204bd3b155299731c8b7da661ce3511 +b967c1ee24740ab58d8111f0f46bd3fcfa3467a5 diff --git a/Gemfile b/Gemfile index 90015012b82..75401ffc4dd 100644 --- a/Gemfile +++ b/Gemfile @@ -25,7 +25,7 @@ gem 'responders', '~> 3.0' gem 'sprockets', '~> 3.7.0' -gem 'view_component', '~> 3.1.0' +gem 'view_component', '~> 3.2.0' # Supported DBs gem 'pg', '~> 1.5.3' diff --git a/Gemfile.checksum b/Gemfile.checksum index 22776a19a95..e5ed8ebcdf8 100644 --- a/Gemfile.checksum +++ b/Gemfile.checksum @@ -673,7 +673,7 @@ {"name":"validates_hostname","version":"1.0.11","platform":"ruby","checksum":"d506bae0342ec14c920eb319e057fc1886c321a59b85b4b6e966ee4b88fab8c3"}, {"name":"version_gem","version":"1.1.0","platform":"ruby","checksum":"6b009518020db57f51ec7b410213fae2bf692baea9f1b51770db97fbc93d9a80"}, {"name":"version_sorter","version":"2.3.0","platform":"ruby","checksum":"2147f2a1a3804fbb8f60d268b7d7c1ec717e6dd727ffe2c165b4e05e82efe1da"}, -{"name":"view_component","version":"3.1.0","platform":"ruby","checksum":"ead1ba472aca31fa9811e513da9b803b45ef555b717574d7bf0dda39ae880e54"}, +{"name":"view_component","version":"3.2.0","platform":"ruby","checksum":"1dfaa85e13b5393f30b60bd3a03348b5298240a13137985d71eb2b8cc94c4c22"}, {"name":"virtus","version":"2.0.0","platform":"ruby","checksum":"8841dae4eb7fcc097320ba5ea516bf1839e5d056c61ee27138aa4bddd6e3d1c2"}, {"name":"vmstat","version":"2.3.0","platform":"ruby","checksum":"ab5446a3e3bd0a9cdb9d9ac69a0bbd119c4f161d945a0846a519dd7018af656d"}, {"name":"warden","version":"1.2.9","platform":"ruby","checksum":"46684f885d35a69dbb883deabf85a222c8e427a957804719e143005df7a1efd0"}, diff --git a/Gemfile.lock b/Gemfile.lock index bdd34f3ba97..c18ac70599e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1608,7 +1608,7 @@ GEM activesupport (>= 3.0) version_gem (1.1.0) version_sorter (2.3.0) - view_component (3.1.0) + view_component (3.2.0) activesupport (>= 5.2.0, < 8.0) concurrent-ruby (~> 1.0) method_source (~> 1.0) @@ -1963,7 +1963,7 @@ DEPENDENCIES valid_email (~> 0.1) validates_hostname (~> 1.0.11) version_sorter (~> 2.3) - view_component (~> 3.1.0) + view_component (~> 3.2.0) vmstat (~> 2.3.0) warning (~> 1.3.0) webauthn (~> 3.0) diff --git a/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_table.vue b/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_table.vue index 1af2cd37880..ec7a921664f 100644 --- a/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_table.vue +++ b/app/assets/javascripts/ci/ci_variable_list/components/ci_variable_table.vue @@ -219,7 +219,6 @@ export default { :fields="fields" :items="variablesWithAttributes" tbody-tr-class="js-ci-variable-row" - data-qa-selector="ci_variable_table_content" sort-by="key" sort-direction="asc" stacked="lg" diff --git a/doc/administration/audit_event_streaming.md b/doc/administration/audit_event_streaming.md index 0dc2d7c4b40..2831996106f 100644 --- a/doc/administration/audit_event_streaming.md +++ b/doc/administration/audit_event_streaming.md @@ -512,6 +512,14 @@ To list streaming destinations for an instance and see the verification tokens: 1. On the main area, select the **Streams**. 1. View the verification token on the right side of each item. +## Override default content type header + +By default, streaming destinations use a `content-type` header of `application/x-www-form-urlencoded`. However, you might want to set the `content-type` header to something else. +For example ,`application/json`. + +To override the `content-type` header default value for either a top-level group streaming destination or an instance streaming destination, use either the +[GitLab UI](#use-the-gitlab-ui-2) or using the [GraphQL API](#use-the-api-2). + ## Event type filters > - Event type filters API [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/344845) in GitLab 15.7. diff --git a/doc/user/application_security/secret_detection/automatic_response.md b/doc/user/application_security/secret_detection/automatic_response.md index a898a63e33b..8f78d36976b 100644 --- a/doc/user/application_security/secret_detection/automatic_response.md +++ b/doc/user/application_security/secret_detection/automatic_response.md @@ -22,6 +22,7 @@ GitLab supports automatic response for the following types of secrets: | ----- | --- | --- | --- | | GitLab [Personal access tokens](../../profile/personal_access_tokens.md) | Immediately revoke token, send email to owner | ✅ | ✅ [15.9 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/371658) | | Amazon Web Services (AWS) [IAM access keys](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_access-keys.html) | Notify AWS | ✅ | ⚙ | +| Google Cloud [service account keys](https://cloud.google.com/iam/docs/best-practices-for-managing-service-account-keys), [API keys](https://cloud.google.com/docs/authentication/api-keys), and [OAuth client secrets](https://support.google.com/cloud/answer/6158849#rotate-client-secret) | Notify Google Cloud | ✅ | ⚙ | **Component legend** diff --git a/qa/qa/page/project/settings/ci_variables.rb b/qa/qa/page/project/settings/ci_variables.rb index 1315ed8ca73..4b587e28382 100644 --- a/qa/qa/page/project/settings/ci_variables.rb +++ b/qa/qa/page/project/settings/ci_variables.rb @@ -19,7 +19,8 @@ module QA click_ci_variable_save_button wait_until(reload: false) do - within_element(:ci_variable_table_content) { has_element?(:edit_ci_variable_button) } + # Using data-testid="ci-variable-table" + within_element(:ci_variable_table) { has_element?(:edit_ci_variable_button) } end end @@ -28,7 +29,8 @@ module QA end def click_edit_ci_variable - within_element(:ci_variable_table_content) do + # Using data-testid="ci-variable-table" + within_element(:ci_variable_table) do click_element :edit_ci_variable_button end end