diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-02 00:10:20 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-02 00:10:20 +0300 |
| commit | cc77bdd6f5f12bea0f50064f3feadcd9c87009a6 (patch) | |
| tree | b9347c56663684eaa5939984c9a604dc767f214e /config | |
| parent | 9cf7b70ac7b17ea3310ebdf83e94d1d5fd248b82 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
3 files changed, 18 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index 703afd0edf0..8753d3304a5 100644 --- a/config/application.rb +++ b/config/application.rb @@ -186,6 +186,7 @@ module Gitlab # - Any parameter containing `password` # - Any parameter containing `secret` # - Any parameter ending with `key` + # - Any parameter named `redirect`, filtered for security concerns of exposing sensitive information # - Two-factor tokens (:otp_attempt) # - Repo/Project Import URLs (:import_url) # - Build traces (:trace) @@ -228,6 +229,7 @@ module Gitlab variables content sharedSecret + redirect ) # This config option can be removed after Rails 7.1 by https://gitlab.com/gitlab-org/gitlab/-/issues/416270 diff --git a/config/feature_flags/development/use_primary_and_secondary_stores_for_etag_cache.yml b/config/feature_flags/development/use_primary_and_secondary_stores_for_etag_cache.yml new file mode 100644 index 00000000000..dda420b590f --- /dev/null +++ b/config/feature_flags/development/use_primary_and_secondary_stores_for_etag_cache.yml @@ -0,0 +1,8 @@ +--- +name: use_primary_and_secondary_stores_for_etag_cache +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/127705 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/419889 +milestone: '16.3' +type: development +group: group::scalability +default_enabled: false diff --git a/config/feature_flags/development/use_primary_store_as_default_for_etag_cache.yml b/config/feature_flags/development/use_primary_store_as_default_for_etag_cache.yml new file mode 100644 index 00000000000..889b64de068 --- /dev/null +++ b/config/feature_flags/development/use_primary_store_as_default_for_etag_cache.yml @@ -0,0 +1,8 @@ +--- +name: use_primary_store_as_default_for_etag_cache +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/127705 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/419889 +milestone: '16.3' +type: development +group: group::scalability +default_enabled: false |