Skip to content
Snippets Groups Projects
Commit 3e2b8f031aca authored by Marin Jankovski's avatar Marin Jankovski
Browse files

Merge branch 'fix-deprecation-namespace' into 'master'

Fix deprecation of gitlab_rails keys

See merge request gitlab-org/omnibus-gitlab!6078
1 merge request!72Intermediate build for testing purposes
......@@ -170,9 +170,9 @@
note: "Use `gitaly['runtime_dir']` instead."
},
{
config_keys: %w(gitlab-rails object_store connection openstack_username),
config_keys: %w(gitlab gitlab-rails object_store connection openstack_username),
deprecation: '14.9',
removal: '15.0',
note: "Update object storage configuration to use S3 API instead of SWIFT."
},
{
......@@ -174,11 +174,11 @@
deprecation: '14.9',
removal: '15.0',
note: "Update object storage configuration to use S3 API instead of SWIFT."
},
{
config_keys: %w(gitlab-rails object_store connection rackspace_username),
config_keys: %w(gitlab gitlab-rails object_store connection rackspace_username),
deprecation: '14.9',
removal: '15.0',
note: "Migrate object storage to another provider other than Rackspace."
},
{
......@@ -180,11 +180,11 @@
deprecation: '14.9',
removal: '15.0',
note: "Migrate object storage to another provider other than Rackspace."
},
{
config_keys: %w(gitlab-rails pseudonymizer_manifest),
config_keys: %w(gitlab gitlab-rails pseudonymizer_manifest),
deprecation: '14.7',
removal: '15.0',
note: "Starting with GitLab 14.7, Pseudonymizer has been deprecated and will be removed."
},
{
......@@ -186,11 +186,11 @@
deprecation: '14.7',
removal: '15.0',
note: "Starting with GitLab 14.7, Pseudonymizer has been deprecated and will be removed."
},
{
config_keys: %w(gitlab-rails pseudonymizer_upload_remote_directory),
config_keys: %w(gitlab gitlab-rails pseudonymizer_upload_remote_directory),
deprecation: '14.7',
removal: '15.0',
note: "Starting with GitLab 14.7, Pseudonymizer has been deprecated and will be removed."
},
{
......@@ -192,11 +192,11 @@
deprecation: '14.7',
removal: '15.0',
note: "Starting with GitLab 14.7, Pseudonymizer has been deprecated and will be removed."
},
{
config_keys: %w(gitlab-rails pseudonymizer_upload_connection),
config_keys: %w(gitlab gitlab-rails pseudonymizer_upload_connection),
deprecation: '14.7',
removal: '15.0',
note: "Starting with GitLab 14.7, Pseudonymizer has been deprecated and will be removed."
},
{
......@@ -198,9 +198,9 @@
deprecation: '14.7',
removal: '15.0',
note: "Starting with GitLab 14.7, Pseudonymizer has been deprecated and will be removed."
},
{
config_keys: %w(gitlab-rails pseudonymizer_worker_cron),
config_keys: %w(gitlab gitlab-rails pseudonymizer_worker_cron),
deprecation: '14.7',
removal: '15.0',
note: "Starting with GitLab 14.7, Pseudonymizer has been deprecated and will be removed."
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment